Andrew's git / gitweb.git / t/t5100/patch0015
?
t / t5100 / patch0015on commit merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir (86273e5)
   1---
   2diff --git a/foo b/foo
   3index e69de29..d95f3ad 100644
   4--- a/foo
   5+++ b/foo
   6@@ -0,0 +1 @@
   7+content
   8