Mercurial > hg-stable

view tests/test-simplemerge.py.out @ 6672:6004eedb13f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keyword: mimic cmdutil.bail_if_changed even more At the check before overwriting with kwexpand, kwshrink: - abort when in middle of merge - give terser abort message
author Christian Ebert <blacktrash@gmx.net>
date Thu, 12 Jun 2008 02:27:06 +0200
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK