diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py index b4aab4223102ab9e2b7a0b197a3f67c6ef8267f6_bWVyY3VyaWFsL2ZpbGVtZXJnZS5weQ==..8bfef57373214a37fe2121f77414bf0bb88ba484_bWVyY3VyaWFsL2ZpbGVtZXJnZS5weQ== 100644 --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -493,6 +493,13 @@ if mergetype == nomerge: return 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) + + ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca)) + a = repo.wjoin(fd) b = temp("base", fca) c = temp("other", fco) @@ -500,13 +507,6 @@ util.copyfile(a, back) files = (a, b, c, back) - 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)) - r = 0 if precheck and not precheck(repo, mynode, orig, fcd, fco, fca, toolconf):