diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py index 7fa3560443fd16a4befdbec0dc33bba88945cfbd_bWVyY3VyaWFsL2ZpbGVtZXJnZS5weQ==..b4aab4223102ab9e2b7a0b197a3f67c6ef8267f6_bWVyY3VyaWFsL2ZpbGVtZXJnZS5weQ== 100644 --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -498,6 +498,7 @@ c = temp("other", fco) back = a + ".orig" 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)) @@ -520,7 +521,7 @@ labels = _formatlabels(repo, fcd, fco, fca, labels) needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf, - (a, b, c, back), labels=labels) + files, labels=labels) if not needcheck: if r: