Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'cb/fetch-set-upstream'
[gitweb.git]
/
t
/
t3400-rebase.sh
diff --git
a/t/t3400-rebase.sh
b/t/t3400-rebase.sh
index 42f147858d7c2e87d6920cdd77744e99bf77001b..80b23fd3269c7828660469207728f67087c82467 100755
(executable)
--- a/
t/t3400-rebase.sh
+++ b/
t/t3400-rebase.sh
@@
-285,7
+285,7
@@
EOF
test_cmp From_.msg out
'
-test_expect_success 'rebase
--am.sh
and --show-current-patch' '
+test_expect_success 'rebase
--am
and --show-current-patch' '
test_create_repo conflict-apply &&
(
cd conflict-apply &&