Andrew's git / gitweb.git / t/t4101/diff.3-2
?
t / t4101 / diff.3-2on commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,3 +1,2 @@
   4 a
   5-c
   6 b
   7\ No newline at end of file