Mercurial > public > mercurial-scm > hg

diff mercurial/filemerge.py @ 41365:876494fd967d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: delete lots of unused local variables These were found by IntelliJ. There are many more, but these seemed pretty safe. Differential Revision: https://phab.mercurial-scm.org/D5629
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 17 Jan 2019 09:17:12 -0800
parents 86dfae98a3a2
children faa49a5914bb
line wrap: on
line diff
--- 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