commit 001799918ba0b716c39e04e28e1b06f656102193
Author: Alex Riesen <raa.lkml@gmail.com>
Date:   Fri Oct 13 11:05:17 2006 +0200

    fix t4015-diff-whitespace.sh on cygwin

diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index c945085..ce47a8a 100755
--- a/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@ -57,8 +57,8 @@ whitespace change
 whitespace in the middle
 whitespace at end
 unchanged line
-CR at end
 EOF
+echo -ne 'CR at end\r\n' >>x
 
 git-update-index x
 
@@ -86,9 +86,9 @@ index d99af23..8b32fb5 100644
 +white space in the middle
 +whitespace at end  
  unchanged line
--CR at end
-+CR at end
 EOF
+printf '%sCR at end\r\n' - >>expect
+printf '+CR at end\n' >>expect
 git-diff > out
 test_expect_success 'another test, without options' 'diff -u expect out'
 
@@ -113,9 +113,9 @@ index d99af23..8b32fb5 100644
 +white space in the middle
 +whitespace at end  
  unchanged line
--CR at end
-+CR at end
 EOF
+printf '%sCR at end\r\n' - >>expect
+printf '+CR at end\n' >>expect
 git-diff -b > out
 test_expect_success 'another test, with -b' 'diff -u expect out'