# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1236193576 21600
# Node ID 20abfd844367be8f00fef29146fd8fbb0f509834
# Parent  e2fc27c867335966862aae29f34deff4deaedc7f
merge: better error messages to lead users to hg update --clean to abandon merges.

Fixes issue1533.

[ original upstream description ]

diff -r e2fc27c86733 -r 20abfd844367 tests/test-keyword.out
--- a/tests/test-keyword.out	Sat Jan 03 17:15:21 2009 +0100
+++ b/tests/test-keyword.out	Wed Mar 04 13:06:16 2009 -0600
@@ -458,7 +458,7 @@
 warning: conflicts during merge.
 merging m failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 % keyword stays outside conflict zone
 $Id$
 <<<<<<< local