Merge branch 'cb/maint-orphan-merge-noclobber'
[git/kirr.git] / t / t4135 / diff-plain.diff
blobacedcfa612e3a67a837c9849a0e910245f362fc1
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