Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-am: Mention --abort in usage string part of OPTIONS_SPEC
[gitweb.git]
/
t
/
t7602-merge-octopus-many.sh
diff --git
a/t/t7602-merge-octopus-many.sh
b/t/t7602-merge-octopus-many.sh
index f3a4bb2ea231f66e26472aa00d2e769cb61350fa..fcb8285746420ed721713d9c8e527d23cafb05cf 100755
(executable)
--- a/
t/t7602-merge-octopus-many.sh
+++ b/
t/t7602-merge-octopus-many.sh
@@
-23,7
+23,7
@@
test_expect_success 'setup' '
done
'
-test_expect_
failure
'merge c1 with c2, c3, c4, ... c29' '
+test_expect_
success
'merge c1 with c2, c3, c4, ... c29' '
git reset --hard c1 &&
i=2 &&
refs="" &&