t3404: fix a typo

dscho · gitster · commit cc8d872e691c · 2019-06-14T12:30:23.000-07:00
This one slipped through the review of a9279c6 (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>
diff --git 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 &&

Original file line number	Diff line number	Diff line change
`@@ -981,7 +981,7 @@ test_expect_success 'rebase -i --root reword root commit' '`
`981`	`981`	`test -z "$(git show -s --format=%p HEAD^)"`
`982`	`982`	`'`
`983`	`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`	`985`	`test_when_finished "reset_rebase" &&`
`986`	`986`	`git checkout -b failing-root-pick A &&`
`987`	`987`	`echo x >file2 &&`