From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Jul 2019 19:38:14 +0000 (-0700)
Subject: Merge branch 'js/t3404-typofix' into maint
X-Git-Tag: v2.23.0-rc0~1^2~25
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0726f13074c1c93cdedd8a9f6a10b579fd6ecba6?hp=82ac2fbaf97aaee32c0c12e0bcb9a1866f4a0a61

Merge branch 'js/t3404-typofix' into maint

Typofix.

* js/t3404-typofix:
t3404: fix a typo
---

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 1723e1a858..46d971b4ef 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -1031,7 +1031,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 &&