diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-06-07 09:04:01 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-07 09:04:01 +0200 |
| commit | a6080a0a44d5ead84db3dabbbc80e82df838533d (patch) | |
| tree | 37360b8334cf8459609d1fae72f8213947858cc0 /t/t6023-merge-file.sh | |
| parent | Merge branch 'sv/objfixes' (diff) | |
| download | git-a6080a0a44d5ead84db3dabbbc80e82df838533d.tar.xz git-a6080a0a44d5ead84db3dabbbc80e82df838533d.zip | |
War on whitespace
This uses "git-apply --whitespace=strip" to fix whitespace errors that have
crept in to our source files over time. There are a few files that need
to have trailing whitespaces (most notably, test vectors). The results
still passes the test, and build result in Documentation/ area is unchanged.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6023-merge-file.sh')
| -rwxr-xr-x | t/t6023-merge-file.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh index c76fccfb5a..43aa5d033d 100755 --- a/t/t6023-merge-file.sh +++ b/t/t6023-merge-file.sh @@ -135,4 +135,3 @@ EOF test_expect_success "expected conflict markers" "git diff expect out" test_done - |