comparison mercurial/help.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 56b2bcea2529
children 7a77ee434179
comparison
equal deleted inserted replaced
27355:652dfb1eff14 27356:c027641f8a83