summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-12-16 13:14:47 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-12-16 13:14:47 -0800
commit4438a1a59fc089ce9e039172391e7b2c26a7b698 (patch)
tree7ff0bd28585f3a225858ec35274365cd84cc39a8 /t
parentMerge branch 'dr/branch-usage-casefix' (diff)
parentt3404: fix indentation (diff)
downloadtgif-4438a1a59fc089ce9e039172391e7b2c26a7b698.tar.xz
Merge branch 'js/t3404-indent-fix'
Test cleanup. * js/t3404-indent-fix: t3404: fix indentation
Diffstat (limited to 't')
-rwxr-xr-xt/t3404-rebase-interactive.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index bf0dc756d2..ae6e55ce79 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -1265,11 +1265,11 @@ test_expect_success SHA1 'short SHA-1 collide' '
test_when_finished "reset_rebase && git checkout master" &&
git checkout collide &&
(
- unset test_tick &&
- test_tick &&
- set_fake_editor &&
- FAKE_COMMIT_MESSAGE="collide2 ac4f2ee" \
- FAKE_LINES="reword 1 2" git rebase -i HEAD~2
+ unset test_tick &&
+ test_tick &&
+ set_fake_editor &&
+ FAKE_COMMIT_MESSAGE="collide2 ac4f2ee" \
+ FAKE_LINES="reword 1 2" git rebase -i HEAD~2
)
'