t / t4101 / diff.1-0on commit t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts (c696606)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,3 +1,2 @@
   4 a
   5 b
   6-c