зеркало из https://github.com/microsoft/git.git
t3404: fix a typo
This one slipped through the review of a9279c6785
(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>
This commit is contained in:
Родитель
a9279c6785
Коммит
cc8d872e69
|
@ -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 &&
|
||||
|
|
Загрузка…
Ссылка в новой задаче