Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'
[git] / t / t4135 / damaged-tz.diff
CommitLineData
2d502e1f
JN
1diff -urN -X /usr/people/jes/exclude-linux linux-2.6.12-rc2-mm3-vanilla/post image.txt linux-2.6.12-rc2-mm3/post image.txt
2--- linux-2.6.12-rc2-mm3-vanilla/post image.txt 1969-12-31 16:00:00 -08:00
3+++ linux-2.6.12-rc2-mm3/post image.txt 2005-04-12 02:14:06 -07:00
4@@ -0,0 +1 @@
5+postimage