diff mercurial/demandimport.py @ 27356:c027641f8a83

revset: rename and test '_destmerge' We make the name consistent with the one used by '_destupdate' and we ensure the code is run by testing it (abort is expected and merge would).
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 15 Oct 2015 01:47:28 +0100 (2015-10-15)
parents 7e81305092a0
children 65387a30430e
line wrap: on
line diff