Andrew's git / gitweb.git / t/t4135/add-plain.diff
?
t / t4135 / add-plain.diffon commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   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