Mercurial > hg
diff mercurial/merge.py @ 41498:a02c8b605d31
diff: use match.intersectmatchers()
Differential Revision: https://phab.mercurial-scm.org/D5789
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 31 Jan 2019 16:32:54 -0800 |
parents | 876494fd967d |
children | ef2295651351 |