Mercurial > hg

view tests/test-simplemerge.py.out @ 20792:89059c450c56

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: mark mergestate as dirty when resolve changes _state Correctness - no visible difference so far.
author Mads Kiilerich <madski@unity3d.com>
date Fri, 28 Feb 2014 02:26:03 +0100
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK