Mercurial > hg
comparison mercurial/manifest.c @ 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 | 89c2bf63a83b |
| children | 7b8b6e3b3571 |
comparison
equal
deleted
inserted
replaced
| 26715:652dfb1eff14 | 26716:c027641f8a83 |
|---|