view tests/test-simplemerge.py.out @ 22129:f0147ff1109f

test-revert: add methodical revert to "base" We now also test reverting s file to the content of another revision. This is still done using the `--all` flag.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 25 Jun 2014 17:16:05 +0100
parents f18830651811
children
line wrap: on
line source

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

OK