Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'sg/git-test-boolean'
[gitweb.git]
/
t
/
t3400-rebase.sh
diff --git
a/t/t3400-rebase.sh
b/t/t3400-rebase.sh
index 4f22e6d3d82cb739c6db7190ead5f94e6ad03c0a..23469cc78937eeec8aabc26c158680c2ca60dd7d 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 &&