Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/t3404-typofix' into maint
author
Junio C Hamano
<gitster@pobox.com>
Mon, 29 Jul 2019 19:38:14 +0000
(12:38 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 29 Jul 2019 19:38:14 +0000
(12:38 -0700)
Typofix.
* js/t3404-typofix:
t3404: fix a typo
t/t3404-rebase-interactive.sh
patch
|
blob
|
history
raw
(from parent 1:
82ac2fb
)
diff --git
a/t/t3404-rebase-interactive.sh
b/t/t3404-rebase-interactive.sh
index 1723e1a858585d9e83d7662326a6f337db7e1fa6..46d971b4efe647d48cb8c771b07e794065992b0b 100755
(executable)
--- 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 conf
il
ct' '
+test_expect_success 'rebase -i --root when root has untracked file conf
li
ct' '
test_when_finished "reset_rebase" &&
git checkout -b failing-root-pick A &&
echo x >file2 &&