summaryrefslogtreecommitdiff
path: root/t/t7602-merge-octopus-many.sh
AgeCommit message (Expand)AuthorFilesLines
2010-11-09tests: add missing &&Libravatar Jonathan Nieder1-1/+1
2009-12-13octopus: reenable fast-forward mergesLibravatar Stephen Boyd1-0/+18
2009-12-13octopus: make merge process simpler to followLibravatar Stephen Boyd1-0/+33
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Libravatar Nanako Shiraishi1-1/+1
2008-07-07Build in mergeLibravatar Miklos Vajna1-1/+1
2008-06-30Add new test to ensure git-merge handles more than 25 refs.Libravatar Miklos Vajna1-0/+52