summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-09 22:25:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-09 22:25:39 (GMT)
commita56a7777bdf7a812fafb45663db26c5f4d988e52 (patch)
tree6b109245d2af0c13c1d8834ec16fece3ba6f2883 /t/t3404-rebase-interactive.sh
parent0af6d5dd062909eee3762e5fdec873ba6e7754b4 (diff)
parentcc8d872e691c9a0cda5a0b08e1c7e92acb6b7ebe (diff)
downloadgit-a56a7777bdf7a812fafb45663db26c5f4d988e52.zip
git-a56a7777bdf7a812fafb45663db26c5f4d988e52.tar.gz
git-a56a7777bdf7a812fafb45663db26c5f4d988e52.tar.bz2
Merge branch 'js/t3404-typofix'
Typofix. * js/t3404-typofix: t3404: fix a typo
Diffstat (limited to 't/t3404-rebase-interactive.sh')
-rwxr-xr-xt/t3404-rebase-interactive.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 1723e1a..46d971b 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 &&