Mercurial > hg

view tests/test-simplemerge.py.out @ 21552:61151f429a5f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: introduce --tool for controlling the merge tool Update is a kind of merge and may also need a merge tool and should have the options described in the merge-tools help.
author Mads Kiilerich <madski@unity3d.com>
date Mon, 19 May 2014 01:53:34 +0200
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK