t / t4101 / diff.0-1on commit t6042: Add tests for content issues with modify/rename/directory conflicts (ac6e839)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,2 +1,3 @@
   4 a
   5 b
   6+c