summaryrefslogtreecommitdiff
path: root/t/t7602-merge-octopus-many.sh
Commit message (Expand)AuthorAgeFilesLines
* tests: add missing &&Jonathan Nieder2010-11-091-1/+1
* octopus: reenable fast-forward mergesStephen Boyd2009-12-131-0/+18
* octopus: make merge process simpler to followStephen Boyd2009-12-131-0/+33
* tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi2008-09-031-1/+1
* Build in mergeMiklos Vajna2008-07-071-1/+1
* Add new test to ensure git-merge handles more than 25 refs.Miklos Vajna2008-06-301-0/+52