view tests/test-simplemerge.py.out @ 20943:003cb972178d

merge: include ancestor node in merge actions
author Mads Kiilerich <madski@unity3d.com>
date Fri, 28 Feb 2014 02:38:33 +0100
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK