diff mercurial/commandserver.py @ 31257:11831d755b51

merge: remove uses of manifest.matches This gets rid of the manifest.matches calls in merge.py in favor of the new api. This is part of getting rid of manifest.matches since it is O(manifest).
author Durham Goode <durham@fb.com>
date Tue, 07 Mar 2017 18:38:20 -0800
parents 48dea083f66d
children c8b9943c07eb
line wrap: on
line diff