t / t4101 / diff.3-2on commit t6042: add testcase covering rename/rename(2to1)/delete/delete conflict (eee7338)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,3 +1,2 @@
   4 a
   5-c
   6 b
   7\ No newline at end of file