Mercurial > hg

changeset 26527:b4aab4223102

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge.filemerge: make a tuple containing merge paths on disk We're going to need this same tuple elsewhere.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 07 Oct 2015 21:21:56 -0700
parents 7fa3560443fd
children 8bfef5737321
files mercurial/filemerge.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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: