diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-29 22:38:14 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 22:38:14 +0300 |
| commit | 0726f13074c1c93cdedd8a9f6a10b579fd6ecba6 (patch) | |
| tree | f13cc8bff43878836b066cfd4aa9a8c77d49c1ad | |
| parent | 82ac2fbaf97aaee32c0c12e0bcb9a1866f4a0a61 (diff) | |
| parent | cc8d872e691c9a0cda5a0b08e1c7e92acb6b7ebe (diff) | |
Merge branch 'js/t3404-typofix' into maint
Typofix.
* js/t3404-typofix:
t3404: fix a typo
| -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 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 && |