Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty...

[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