--- a/mercurial/filemerge.py Thu Aug 24 21:30:37 2017 -0700
+++ b/mercurial/filemerge.py Thu Aug 24 21:30:51 2017 -0700
@@ -341,7 +341,7 @@
labels = _defaultconflictlabels
if len(labels) < 3:
labels.append('base')
- r = simplemerge.simplemerge(ui, a, b, c, fcd, fca, fco,
+ r = simplemerge.simplemerge(ui, fcd, fca, fco,
quiet=True, label=labels, repo=repo)
if not r:
ui.debug(" premerge successful\n")
@@ -372,7 +372,7 @@
ui = repo.ui
- r = simplemerge.simplemerge(ui, a, b, c, fcd, fca, fco,
+ r = simplemerge.simplemerge(ui, fcd, fca, fco,
label=labels, mode=mode, repo=repo)
return True, r, False
@@ -425,7 +425,7 @@
assert localorother is not None
tool, toolpath, binary, symlink = toolconf
a, b, c, back = files
- r = simplemerge.simplemerge(repo.ui, a, b, c, fcd, fca, fco,
+ r = simplemerge.simplemerge(repo.ui, fcd, fca, fco,
label=labels, localorother=localorother,
repo=repo)
return True, r