summaryrefslogtreecommitdiff
path: root/t/t7601-merge-pull-config.sh
AgeCommit message (Expand)Author
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi
2008-07-23t7601: extend the 'merge picks up the best result' testMiklos Vajna
2008-07-22builtin-merge: give a proper error message for invalid strategies in configMiklos Vajna
2008-07-07Fix t7601-merge-pull-config.sh on AIXMiklos Vajna
2008-07-01Add new test to ensure git-merge handles pull.twohead and pull.octopusMiklos Vajna