Mercurial > hg

view tests/test-simplemerge.py.out @ 20642:0dc7a50345c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: use the right ancestor when both sides copied the same file The tests shows no real changes because of this ... but there must be some weird corner cases where using the right ancestor for the merge planning is better than using the wrong one.
author Mads Kiilerich <madski@unity3d.com>
date Tue, 25 Feb 2014 20:29:46 +0100
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK