Andrew's git / gitweb.git / t/t4135/git-plain.diff
?
t / t4135 / git-plain.diffon commit merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir (86273e5)
   1diff --git a/postimage.txt b/postimage.txt
   2new file mode 100644
   3index 0000000..eff0c54
   4--- /dev/null
   5+++ b/postimage.txt
   6@@ -0,0 +1 @@
   7+postimage