aboutsummaryrefslogtreecommitdiff
path: root/t/t7602-merge-octopus-many.sh
Commit message (Expand)AuthorAge
* tests: add missing &&Jonathan Nieder2010-11-09
* octopus: reenable fast-forward mergesStephen Boyd2009-12-13
* octopus: make merge process simpler to followStephen Boyd2009-12-13
* tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi2008-09-03
* Build in mergeMiklos Vajna2008-07-07
* Add new test to ensure git-merge handles more than 25 refs.Miklos Vajna2008-06-30