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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jun 14, 2019 at 05:16 UTC
cc8d872e691c9a0cda5a0b08e1c7e92acb6b7ebe
1 file changed
+1
-1
t/t3404-rebase-interactive.sh
+1
-1
@@ -981,7 +981,7 @@ test_expect_success 'rebase -i --root reword root commit' '
981
test -z "$(git show -s --format=%p HEAD^)"
982
'
983
984
-test_expect_success 'rebase -i --root when root has untracked file confilct' '
984
+test_expect_success 'rebase -i --root when root has untracked file conflict' '
985
test_when_finished "reset_rebase" &&
986
git checkout -b failing-root-pick A &&
987
echo x >file2 &&