comparison hgext3rd/__init__.py @ 3322:20b6dae466a7

stablesort: use 'depth' in mergepoint tie breaker The parents with the most depth will is considered lower. It has a couple of advantages. 1) the more shallow parent probably have less exclusive revision, 2) it makes Oedipus merge behave like close to the linear case,
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 20 Dec 2017 16:20:26 +0100
parents 143c8e4dc22d
children
comparison
equal deleted inserted replaced
3321:14024940f369 3322:20b6dae466a7