Andrew's git / gitweb.git / t/t4101/diff.0-2
?
t / t4101 / diff.0-2on commit checkout --conflict=diff3: add a label for ancestor (f0531a2)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,2 +1,2 @@
   4 a
   5-b
   6+b
   7\ No newline at end of file