Merge branch 'js/t3404-typofix'

Typofix.

* js/t3404-typofix:
  t3404: fix a typo
This commit is contained in:
Junio C Hamano 2019-07-09 15:25:39 -07:00
commit a56a7777bd

View File

@ -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 &&