Mercurial > public > mercurial-scm > hg-stable

diff mercurial/filemerge.py @ 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 157d93c41c10
children e86dd8dfdea0
line wrap: on
line diff
--- a/mercurial/filemerge.py	Sat Nov 12 02:08:01 2011 +0100
+++ b/mercurial/filemerge.py	Wed Nov 16 18:04:19 2011 -0600
@@ -262,7 +262,11 @@
         _matcheol(repo.wjoin(fd), back)
 
     if r:
-        ui.warn(_("merging %s failed!\n") % fd)
+        if tool == "internal:merge":
+            ui.warn(_("merging %s incomplete! "
+                      "(edit conflicts, then use 'hg resolve --mark')\n") % fd)
+        else:
+            ui.warn(_("merging %s failed!\n") % fd)
     else:
         os.unlink(back)