Mercurial > hg > mercurial-source
comparison mercurial/py3kcompat.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 |
parents | a7a9d84f5e4a |
children | 5bfd01a3c2a9 |
comparison
equal
deleted
inserted
replaced
27355:652dfb1eff14 | 27356:c027641f8a83 |
---|