Andrew's git / gitweb.git / t/t4101/diff.1-2
?
t / t4101 / diff.1-2on commit pull: pass git-merge's options to git-merge (11b6d17)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,3 +1,2 @@
   4 a
   5-b
   6-c
   7+b
   8\ No newline at end of file