Mercurial > hg

diff tests/test-lfconvert.t @ 15501:2371f4aea665

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: give a special message for internal:merge failure (issue3105)
author Matt Mackall <mpm@selenic.com>
date Wed, 16 Nov 2011 18:04:19 -0600
parents 9910f60a37ee
children 97fc5eec3f43
line wrap: on
line diff
--- a/tests/test-lfconvert.t	Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-lfconvert.t	Wed Nov 16 18:04:19 2011 -0600
@@ -84,7 +84,7 @@
   $ hg merge
   merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat
   warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. (glob)
-  merging stuff/maybelarge.dat failed!
+  merging stuff/maybelarge.dat incomplete! (edit conflicts, then use 'hg resolve --mark')
   merging sub/normal2 and stuff/normal2 to stuff/normal2
   0 files updated, 1 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon