Mercurial > hg

view tests/test-simplemerge.py.out @ 21541:6062593d8b06

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: don't abort resolve -l even when no merge is in progress This broke some internal automation that was quite reasonably checking for unresolved files as a way to determine whether a merge happened cleanly. We still abort for resolve --mark etc.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 23 May 2014 13:10:31 -0700
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

....................
----------------------------------------------------------------------
Ran 20 tests in 0.000s

OK