Mercurial > hg
comparison hgext/convert/p4.py @ 26716: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 | 56b2bcea2529 |
children | aaa33ec3c951 |
comparison
equal
deleted
inserted
replaced
26715:652dfb1eff14 | 26716:c027641f8a83 |
---|