Mercurial > hg

view tests/test-simplemerge.py.out @ 23405:2a038deeac9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: 0 is a valid ancestor different from None Most internal functions can take either a hash or an integer. Merge did however not handle 0 as revision 0. Now it does.
author Mads Kiilerich <madski@unity3d.com>
date Sun, 30 Nov 2014 19:26:53 +0100
parents f18830651811
children
line wrap: on
line source

................
----------------------------------------------------------------------
Ran 16 tests in 0.000s

OK