Mercurial > hg

view tests/test-simplemerge.py.out @ 26619:3b213a904b98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-resolve.t: add some output to show order of operations This basically shows the behavior of resolve with multiple files. An upcoming behavior change will cause this output to also change.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 11 Oct 2015 23:54:40 -0700
parents f18830651811
children
line wrap: on
line source

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

OK