--- a/mercurial/filemerge.py Thu Oct 08 00:19:20 2015 -0700
+++ b/mercurial/filemerge.py Sun Oct 11 20:02:53 2015 -0700
@@ -487,10 +487,11 @@
if mergetype == nomerge:
return True, func(repo, mynode, orig, fcd, fco, fca, toolconf)
- if orig != fco.path():
- ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd))
- else:
- ui.status(_("merging %s\n") % fd)
+ if premerge:
+ if orig != fco.path():
+ ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd))
+ else:
+ ui.status(_("merging %s\n") % fd)
ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca))