Andrew's git / gitweb.git / t/t4135/diff-plain.diff
?
t / t4135 / diff-plain.diffon commit t6036: Add differently resolved modify/delete conflict in criss-cross test (fe7e9c2)
   1--- postimage.txt.orig  2010-08-18 20:13:31.432002255 -0500
   2+++ postimage.txt       2010-08-18 20:13:31.432002255 -0500
   3@@ -1 +1 @@
   4-preimage
   5+postimage