diff -r 0b2361c2c493 -r cd7059d17cb2 mercurial/context.py --- a/mercurial/context.py Thu Feb 21 19:11:28 2019 -0800 +++ b/mercurial/context.py Thu Feb 21 19:11:35 2019 -0800 @@ -1951,7 +1951,7 @@ # Test the other direction -- that this path from p2 isn't a directory # in p1 (test that p1 doesn't have any paths matching `path/*`). - match = self.match(pats=[path + '/'], default=b'path') + match = self.match(include=[path + '/'], default=b'path') matches = self.p1().manifest().matches(match) mfiles = matches.keys() if len(mfiles) > 0: