aboutsummaryrefslogtreecommitdiff
path: root/t/t7601-merge-pull-config.sh
Commit message (Expand)AuthorAge
* t7601 (merge-pull-config): add missing &&Elijah Newren2010-10-06
* tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi2008-09-03
* t7601: extend the 'merge picks up the best result' testMiklos Vajna2008-07-23
* builtin-merge: give a proper error message for invalid strategies in configMiklos Vajna2008-07-21
* Fix t7601-merge-pull-config.sh on AIXMiklos Vajna2008-07-06
* Add new test to ensure git-merge handles pull.twohead and pull.octopusMiklos Vajna2008-06-30