t / t4101 / diff.1-0on commit t6031: Add a testcase covering multiple renames across a D/F conflict (5601ba6)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,3 +1,2 @@
   4 a
   5 b
   6-c