Mercurial > public > mercurial-scm > hg

diff mercurial/merge.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 8c222bec97da
children ef2295651351
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Sep 24 14:46:37 2018 -0700
+++ b/mercurial/merge.py	Thu Jan 17 09:17:12 2019 -0800
@@ -1186,9 +1186,6 @@
 
     diff = m1.diff(m2, match=matcher)
 
-    if matcher is None:
-        matcher = matchmod.always('', '')
-
     actions = {}
     for f, ((n1, fl1), (n2, fl2)) in diff.iteritems():
         if n1 and n2: # file exists on both local and remote side