--- a/mercurial/commands.py Fri Oct 05 01:55:51 2018 +0300
+++ b/mercurial/commands.py Fri Sep 28 12:29:21 2018 -0700
@@ -44,7 +44,6 @@
help,
hg,
logcmdutil,
- match as matchmod,
merge as mergemod,
narrowspec,
obsolete,
@@ -1970,7 +1969,7 @@
diffopts = patch.diffallopts(ui, opts)
m = scmutil.match(ctx2, pats, opts)
- m = matchmod.intersectmatchers(m, repo.narrowmatch())
+ m = repo.narrowmatch(m)
ui.pager('diff')
logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
listsubrepos=opts.get('subrepos'),