Andrew's git / gitweb.git / t/t4101/diff.2-1
?
t / t4101 / diff.2-1on commit unpack-trees: fix "read-tree -u --reset A B" with conflicted index (b018ff6)
   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