Andrew's git / gitweb.git / t/t4135/damaged.diff
?
t / t4135 / damaged.diffon commit merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir (86273e5)
   1diff -pruN a/postimage.txt b/postimage.txt
   2--- a/postimage.txt     1969-12-31 18:00:00.000000000 -0600
   3+++ b/postimage.txt     2010-08-18 20:13:31.484002255 -0500
   4@@ -0,0 +1 @@
   5+postimage