From 7ea14fa915bd18b8675a0eebe370b979f309bae5 Mon Sep 17 00:00:00 2001 From: Siddharth Agarwal Date: Wed, 7 Oct 2015 21:21:56 -0700 Subject: [PATCH] filemerge.filemerge: make a tuple containing merge paths on disk We're going to need this same tuple elsewhere. --- mercurial/filemerge.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py index a1fe910029..2b8773edae 100644 --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -498,6 +498,7 @@ def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None): 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 @@ def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None): 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: