diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-10 01:25:39 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-10 01:25:39 +0300 |
| commit | a56a7777bdf7a812fafb45663db26c5f4d988e52 (patch) | |
| tree | 6b109245d2af0c13c1d8834ec16fece3ba6f2883 | |
| parent | 0af6d5dd062909eee3762e5fdec873ba6e7754b4 (diff) | |
| parent | cc8d872e691c9a0cda5a0b08e1c7e92acb6b7ebe (diff) | |
Merge branch 'js/t3404-typofix'
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 && |