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