kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'js/t3404-typofix' 

Typofix.

* js/t3404-typofix:
  t3404: fix a typo
maint
Junio C Hamano 2019-07-09 15:25:39 -07:00
parent 0af6d5dd06 cc8d872e69
commit a56a7777bd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t3404-rebase-interactive.sh
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 &&