diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-01-29 13:18:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-29 13:18:55 -0800 |
| commit | 86e15ff4fe9924b73af32d1bebe77eb5592b93cd (patch) | |
| tree | 4f8f2fe9aa3a3461e29e04c440394f5777b0b5a4 /t | |
| parent | Merge branch 'jk/parse-object-cached' (diff) | |
| parent | xdiff: print post-image for common records instead of pre-image (diff) | |
| download | tgif-86e15ff4fe9924b73af32d1bebe77eb5592b93cd.tar.xz | |
Merge branch 'rs/diff-postimage-in-context'
* rs/diff-postimage-in-context:
xdiff: print post-image for common records instead of pre-image
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4015-diff-whitespace.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index 9059bcd69e..cc3db1304e 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -103,7 +103,7 @@ test_expect_success 'another test, with -w --ignore-space-at-eol' 'test_cmp expe git diff -w -b --ignore-space-at-eol > out test_expect_success 'another test, with -w -b --ignore-space-at-eol' 'test_cmp expect out' -tr 'Q' '\015' << EOF > expect +tr 'Q_' '\015 ' << EOF > expect diff --git a/x b/x index d99af23..8b32fb5 100644 --- a/x @@ -111,19 +111,19 @@ index d99af23..8b32fb5 100644 @@ -1,6 +1,6 @@ -whitespace at beginning + whitespace at beginning - whitespace change + whitespace change -whitespace in the middle +white space in the middle - whitespace at end + whitespace at end__ unchanged line - CR at endQ + CR at end EOF git diff -b > out test_expect_success 'another test, with -b' 'test_cmp expect out' git diff -b --ignore-space-at-eol > out test_expect_success 'another test, with -b --ignore-space-at-eol' 'test_cmp expect out' -tr 'Q' '\015' << EOF > expect +tr 'Q_' '\015 ' << EOF > expect diff --git a/x b/x index d99af23..8b32fb5 100644 --- a/x @@ -135,9 +135,9 @@ index d99af23..8b32fb5 100644 + whitespace at beginning +whitespace change +white space in the middle - whitespace at end + whitespace at end__ unchanged line - CR at endQ + CR at end EOF git diff --ignore-space-at-eol > out test_expect_success 'another test, with --ignore-space-at-eol' 'test_cmp expect out' |