view tests/test-simplemerge.py.out @ 22188:0ad619c5e1a4

revert: use "remove" information from both statuses Using status information against the target to make sure we are catching all files that need to be re-added. We still need to distinguish fresh removal because they use a different message.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 24 Jun 2014 16:53:22 +0100
parents f18830651811
children
line wrap: on
line source

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

OK