Andrew's git / gitweb.git / t/t5100/patch0015--no-inbody-headers
?
t / t5100 / patch0015--no-inbody-headerson commit merge-recursive: check for file level conflicts then get new name (f6f7755)
   1---
   2diff --git a/foo b/foo
   3index e69de29..d95f3ad 100644
   4--- a/foo
   5+++ b/foo
   6@@ -0,0 +1 @@
   7+content
   8