Mercurial > hg

view tests/test-simplemerge.py.out @ 18042:551e2901192e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix mistake in moved _checkcollision call from 5881d5b7552f
author Kevin Bullock <kbullock@ringworld.org>
date Thu, 06 Dec 2012 22:07:44 -0600
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK