Andrew's git / gitweb.git / t/t4101/diff.0-2
?
t / t4101 / diff.0-2on commit unpack-trees: fix "read-tree -u --reset A B" with conflicted index (b018ff6)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,2 +1,2 @@
   4 a
   5-b
   6+b
   7\ No newline at end of file