t3404: fix a typo
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Fri, 14 Jun 2019 12:16:08 +0000 (05:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Jun 2019 19:30:23 +0000 (12:30 -0700)
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>
t/t3404-rebase-interactive.sh
index d392160ba9957d9918f59cdfb031f66c624e90f3..64b553ebe0958125bde67ba7b6af49662a3b05da 100755 (executable)
@@ -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 &&