changeset 14671 | 35c2cc322ba8 |
parent 14327 | d943412e2fba |
child 14739 | a95efd378641 |
--- a/hgext/extdiff.py Sat Jun 18 16:52:51 2011 -0500 +++ b/hgext/extdiff.py Sat Jun 18 16:52:51 2011 -0500 @@ -137,7 +137,7 @@ if node1b == nullid: do3way = False - matcher = scmutil.match(repo, pats, opts) + matcher = scmutil.match(repo[node2], pats, opts) mod_a, add_a, rem_a = map(set, repo.status(node1a, node2, matcher)[:3]) if do3way: mod_b, add_b, rem_b = map(set, repo.status(node1b, node2, matcher)[:3])