summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-06-14 12:16:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-06-14 19:30:23 (GMT)
commitcc8d872e691c9a0cda5a0b08e1c7e92acb6b7ebe (patch)
tree3584b2706d7d3a14dfe18eee22bc4ea1526670cf /t/t3404-rebase-interactive.sh
parenta9279c678588a12485a8afa424036bdb5ad0534d (diff)
downloadgit-cc8d872e691c9a0cda5a0b08e1c7e92acb6b7ebe.zip
git-cc8d872e691c9a0cda5a0b08e1c7e92acb6b7ebe.tar.gz
git-cc8d872e691c9a0cda5a0b08e1c7e92acb6b7ebe.tar.bz2
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>
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 d392160..64b553e 100755
--- 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 &&