Andrew's git / gitweb.git / t/t4101/diff.2-3
?
t / t4101 / diff.2-3on commit rerere: teach rerere to handle nested conflicts (4af3220)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,2 +1,3 @@
   4 a
   5+c
   6 b
   7\ No newline at end of file