Andrew's git / gitweb.git / t/t4101/diff.3-1
?
t / t4101 / diff.3-1on commit merge-recursive: check for file level conflicts then get new name (f6f7755)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,3 +1,3 @@
   4 a
   5+b
   6 c
   7-b
   8\ No newline at end of file