Skip to content

Commit

Permalink
Merge branch 'js/t3404-indent-fix' into jch
Browse files Browse the repository at this point in the history
Test cleanup.

* js/t3404-indent-fix:
  t3404: fix indentation
  • Loading branch information
gitster committed Dec 10, 2019
2 parents 857c8ac + 8cf8f9b commit 21c96de
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions t/t3404-rebase-interactive.sh
Expand Up @@ -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
)
'

Expand Down

0 comments on commit 21c96de

Please sign in to comment.