--- a/mercurial/filemerge.py Sun Oct 11 15:04:00 2015 -0700
+++ b/mercurial/filemerge.py Fri Oct 09 13:54:52 2015 -0700
@@ -255,8 +255,8 @@
return True, r
@internaltool('union', fullmerge,
- _("merging %s incomplete! "
- "(edit conflicts, then use 'hg resolve --mark')\n"),
+ _("warning: conflicts while merging %s! "
+ "(edit, then use 'hg resolve --mark')\n"),
precheck=_symlinkcheck)
def _iunion(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
"""
@@ -267,8 +267,8 @@
files, labels, 'union')
@internaltool('merge', fullmerge,
- _("merging %s incomplete! "
- "(edit conflicts, then use 'hg resolve --mark')\n"),
+ _("warning: conflicts while merging %s! "
+ "(edit, then use 'hg resolve --mark')\n"),
precheck=_symlinkcheck)
def _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
"""
@@ -280,8 +280,8 @@
files, labels, 'merge')
@internaltool('merge3', fullmerge,
- _("merging %s incomplete! "
- "(edit conflicts, then use 'hg resolve --mark')\n"),
+ _("warning: conflicts while merging %s! "
+ "(edit, then use 'hg resolve --mark')\n"),
precheck=_symlinkcheck)
def _imerge3(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
"""