summaryrefslogtreecommitdiff
path: root/t/t7601-merge-pull-config.sh
Commit message (Expand)AuthorAgeFilesLines
* Fix t7601-merge-pull-config.sh on AIXMiklos Vajna2008-07-061-7/+7
* Add new test to ensure git-merge handles pull.twohead and pull.octopusMiklos Vajna2008-06-301-0/+129