changeset 41365 | 876494fd967d |
parent 40478 | 86dfae98a3a2 |
child 41510 | faa49a5914bb |
--- a/mercurial/filemerge.py Mon Sep 24 14:46:37 2018 -0700 +++ b/mercurial/filemerge.py Thu Jan 17 09:17:12 2019 -0800 @@ -462,7 +462,6 @@ Generic driver for _imergelocal and _imergeother """ assert localorother is not None - tool, toolpath, binary, symlink, scriptfn = toolconf r = simplemerge.simplemerge(repo.ui, fcd, fca, fco, label=labels, localorother=localorother) return True, r