# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1444278116 25200
# Node ID b4aab4223102ab9e2b7a0b197a3f67c6ef8267f6
# Parent  7fa3560443fd16a4befdbec0dc33bba88945cfbd
filemerge.filemerge: make a tuple containing merge paths on disk

We're going to need this same tuple elsewhere.

diff -r 7fa3560443fd -r b4aab4223102 mercurial/filemerge.py
--- 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: