Mercurial > hg

comparison tests/test-issue842.t @ 21573:4af19d39706e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert: add a test case to reverting "add" during merges This kind of revert is specifically trickier since the file is reported as "modified" by status. This case was only tested by some largefiles test. We introduce proper testing of all aspects of this case in the revert tests themselves.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 13 May 2014 17:28:19 -0700
parents 41885892796e
children 2fc86d92c4a9
comparison
equal deleted inserted replaced
21563:764b691b8bda 21573:4af19d39706e