diff tests/test-rebase-pull.t @ 21573:4af19d39706e

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 dc5157841361
children 328afbad6e57
line wrap: on
line diff