Mercurial > hg

diff tests/test-ancestor.py.out @ 26716:c027641f8a83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 3b1b8f25443e
children b6db2e80a9ce
line wrap: on
line diff