summaryrefslogtreecommitdiff
path: root/t/t3030-merge-recursive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-06-07 00:04:01 -0700
committerJunio C Hamano <gitster@pobox.com>2007-06-07 00:04:01 -0700
commita6080a0a44d5ead84db3dabbbc80e82df838533d (patch)
tree37360b8334cf8459609d1fae72f8213947858cc0 /t/t3030-merge-recursive.sh
parentd44c782bbd6b0e806e056f9e8ff8cd8e426e67a3 (diff)
downloadgit-a6080a0a44d5ead84db3dabbbc80e82df838533d.tar.gz
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/t3030-merge-recursive.sh')
-rwxr-xr-xt/t3030-merge-recursive.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
index 86ee2b0bd3..607f57ff94 100755
--- a/t/t3030-merge-recursive.sh
+++ b/t/t3030-merge-recursive.sh
@@ -525,4 +525,3 @@ test_expect_success 'reset and bind merge' '
'
test_done
-