Andrew's git / gitweb.git / t/t5100/patch0006
?
t / t5100 / patch0006on commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1---
   2 foo |    2 +-
   3 1 files changed, 1 insertions(+), 1 deletions(-)
   4
   5diff --git a/foo b/foo
   6index 9123cdc..918dcf8 100644
   7--- a/foo
   8+++ b/foo
   9@@ -1 +1 @@
  10-Fri Jun  9 00:44:04 PDT 2006
  11+Fri Jun  9 00:44:13 PDT 2006
  12-- 
  131.4.0.g6f2b
  14