Merge branch 'js/t3404-indent-fix'
Test cleanup. * js/t3404-indent-fix: t3404: fix indentation
This commit is contained in:
commit
4438a1a59f
@ -1265,11 +1265,11 @@ test_expect_success SHA1 'short SHA-1 collide' '
|
|||||||
test_when_finished "reset_rebase && git checkout master" &&
|
test_when_finished "reset_rebase && git checkout master" &&
|
||||||
git checkout collide &&
|
git checkout collide &&
|
||||||
(
|
(
|
||||||
unset test_tick &&
|
unset test_tick &&
|
||||||
test_tick &&
|
test_tick &&
|
||||||
set_fake_editor &&
|
set_fake_editor &&
|
||||||
FAKE_COMMIT_MESSAGE="collide2 ac4f2ee" \
|
FAKE_COMMIT_MESSAGE="collide2 ac4f2ee" \
|
||||||
FAKE_LINES="reword 1 2" git rebase -i HEAD~2
|
FAKE_LINES="reword 1 2" git rebase -i HEAD~2
|
||||||
)
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user