comparison tests/test-merge7.t @ 22397:1db04829bdc1

revert: distinguish between deleted file and locally modified Locally modified needs a backup while a deleted file cannot be backed up because there is no file to backup.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sat, 30 Aug 2014 02:09:53 +0200
parents b081decd9062
children bd625cd4e5e7
comparison
equal deleted inserted replaced
22396:c0213f2cb942 22397:1db04829bdc1