Andrew's git / gitweb.git / t/t4101/diff.2-0
?
t / t4101 / diff.2-0on commit checkout --conflict=<style>: recreate merge in a non-default style (eac5a40)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,2 +1,2 @@
   4 a
   5-b
   6\ No newline at end of file
   7+b