comparison mercurial/mergeutil.py @ 33143:d09ae850296d

obsutil: move 'exclusivemarkers' to the new modules We have a new 'obsutil' module now. We move the high level utility there to bring 'obsolete.py' back to a more reasonable size.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 27 Jun 2017 01:11:56 +0200
parents c1149533676b
children 2372284d9457
comparison
equal deleted inserted replaced
33142:4f49810a1011 33143:d09ae850296d