From: Johannes Schindelin Date: Fri, 14 Jun 2019 12:16:08 +0000 (-0700) Subject: t3404: fix a typo X-Git-Tag: v2.23.0-rc0~79^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cc8d872e691c9a0cda5a0b08e1c7e92acb6b7ebe t3404: fix a typo This one slipped through the review of a9279c678588 (sequencer: do not squash 'reword' commits when we hit conflicts, 2018-06-19). Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index d392160ba9..64b553ebe0 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -981,7 +981,7 @@ test_expect_success 'rebase -i --root reword root commit' ' test -z "$(git show -s --format=%p HEAD^)" ' -test_expect_success 'rebase -i --root when root has untracked file confilct' ' +test_expect_success 'rebase -i --root when root has untracked file conflict' ' test_when_finished "reset_rebase" && git checkout -b failing-root-pick A && echo x >file2 &&