diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-06-14 05:16:08 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-06-14 12:30:23 -0700 |
| commit | cc8d872e691c9a0cda5a0b08e1c7e92acb6b7ebe (patch) | |
| tree | 3584b2706d7d3a14dfe18eee22bc4ea1526670cf /t | |
| parent | sequencer: do not squash 'reword' commits when we hit conflicts (diff) | |
| download | tgif-cc8d872e691c9a0cda5a0b08e1c7e92acb6b7ebe.tar.xz | |
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')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index d392160ba9..64b553ebe0 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 && |