Andrew's git / gitweb.git / t/t4101/diff.2-1
?
t / t4101 / diff.2-1on commit merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir (86273e5)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,2 +1,3 @@
   4 a
   5-b
   6\ No newline at end of file
   7+b
   8+c