view tests/test-simplemerge.py.out @ 22488:6c52ed3f888e

revert: split between newly added file and file added in other changeset These two kinds of files are handled differently. One is deleted and the other is just forgotten (the file is untracked but left in place). The distinction is done in the `_performrevert` code itself and we would like to get ride of this.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sat, 30 Aug 2014 18:20:29 +0200
parents f18830651811
children
line wrap: on
line source

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

OK