phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REVISION SUMMARY Otherwise, this should be a no-op. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D373 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -353,7 +353,8 @@ labels = _defaultconflictlabels if len(labels) < 3: labels.append('base') - r = simplemerge.simplemerge(ui, a, b, c, quiet=True, label=labels) + r = simplemerge.simplemerge(ui, a, b, c, fcd, fca, fco, + quiet=True, label=labels, repo=repo) if not r: ui.debug(" premerge successful\n") return 0 @@ -383,7 +384,8 @@ ui = repo.ui - r = simplemerge.simplemerge(ui, a, b, c, label=labels, mode=mode) + r = simplemerge.simplemerge(ui, a, b, c, fcd, fca, fco, + label=labels, mode=mode, repo=repo) return True, r, False @internaltool('union', fullmerge, @@ -435,8 +437,9 @@ assert localorother is not None tool, toolpath, binary, symlink = toolconf a, b, c, back = files - r = simplemerge.simplemerge(repo.ui, a, b, c, label=labels, - localorother=localorother) + r = simplemerge.simplemerge(repo.ui, a, b, c, fcd, fca, fco, + label=labels, localorother=localorother, + repo=repo) return True, r @internaltool('merge-local', mergeonly, precheck=_mergecheck) To: phillco, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel