aboutsummaryrefslogtreecommitdiff
path: root/t/t6021-merge-criss-cross.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/t6021-merge-criss-cross.sh
parentd44c782bbd6b0e806e056f9e8ff8cd8e426e67a3 (diff)
downloadgit-a6080a0a44d5ead84db3dabbbc80e82df838533d.tar.gz
git-a6080a0a44d5ead84db3dabbbc80e82df838533d.tar.xz
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/t6021-merge-criss-cross.sh')
-rwxr-xr-xt/t6021-merge-criss-cross.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh
index 499cafb88..0ab14a6e8 100755
--- a/t/t6021-merge-criss-cross.sh
+++ b/t/t6021-merge-criss-cross.sh
@@ -20,7 +20,7 @@ test_expect_success 'prepare repository' \
7
8
9" > file &&
-git add file &&
+git add file &&
git commit -m "Initial commit" file &&
git branch A &&
git branch B &&