Merge branch 'maint-1.7.8' into maint-1.7.9

[git.git] / t / t4135 / diff-plain.diff

--- postimage.txt.orig  2010-08-18 20:13:31.432002255 -0500
+++ postimage.txt       2010-08-18 20:13:31.432002255 -0500
@@ -1 +1 @@
-preimage
+postimage