filemerge.filemerge: make a tuple containing merge paths on disk
We're going to need this same tuple elsewhere.
--- a/mercurial/filemerge.py Wed Oct 07 16:14:57 2015 -0700
+++ b/mercurial/filemerge.py Wed Oct 07 21:21:56 2015 -0700
@@ -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: