Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Fix parsing of @{-1}@{1}
[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 fcb8285746420ed721713d9c8e527d23cafb05cf..01e5415e943f3e16154f2f4d999f85a9d8b6ae49 100755
(executable)
--- a/
t/t7602-merge-octopus-many.sh
+++ b/
t/t7602-merge-octopus-many.sh
@@
-1,6
+1,6
@@
#!/bin/sh
-test_description='git
-
merge
+test_description='git
merge
Testing octopus merge with more than 25 refs.'