summaryrefslogtreecommitdiff
path: root/t/t7601-merge-pull-config.sh
Commit message (Expand)AuthorAgeFilesLines
* t7601: extend the 'merge picks up the best result' testMiklos Vajna2008-07-231-0/+15
* builtin-merge: give a proper error message for invalid strategies in configMiklos Vajna2008-07-211-0/+12
* 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