t / t4101 / diff.1-0on commit t3600: test behavior of reverse-d/f conflict (96ec8ee)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,3 +1,2 @@
   4 a
   5 b
   6-c