Mercurial > hg

view tests/test-simplemerge.py.out @ 27136:29b08ca680b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-merge-changedelete.t: print out debugmergestate We're going to use this to verify the merge state in upcoming patches.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 25 Nov 2015 14:26:46 -0800
parents f18830651811
children
line wrap: on
line source

................
----------------------------------------------------------------------
Ran 16 tests in 0.000s

OK