Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jh/partial-clone-doc'
[gitweb.git]
/
t
/
t3430-rebase-merges.sh
diff --git
a/t/t3430-rebase-merges.sh
b/t/t3430-rebase-merges.sh
index 0bf5eaa376be2749297c56c31c9aa744ea46b90b..90ae613e23fb5bbbde638c25dd052d398169fba6 100755
(executable)
--- a/
t/t3430-rebase-merges.sh
+++ b/
t/t3430-rebase-merges.sh
@@
-363,7
+363,7
@@
test_expect_success 'octopus merges' '
EOF
'
-test_expect_
failure
'with --autosquash and --exec' '
+test_expect_
success
'with --autosquash and --exec' '
git checkout -b with-exec H &&
echo Booh >B.t &&
test_tick &&