# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1321488259 21600
# Node ID 0b56a38520afd50d1a60718df27fd9a0ba0246f5
# Parent  34ebea1c49c9fa45ab39292b2037eea36101e549
merge: give a special message for internal:merge failure (issue3105)

[ original upstream message ]

diff -r 34ebea1c49c9 -r 0b56a38520af tests/test-keyword.t
--- a/tests/test-keyword.t	Wed Nov 16 03:45:14 2011 +0100
+++ b/tests/test-keyword.t	Wed Nov 16 18:04:19 2011 -0600
@@ -976,7 +976,7 @@
   $ hg merge
   merging m
   warning: conflicts during merge.
-  merging m failed!
+  merging m incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]