summaryrefslogtreecommitdiff
path: root/t/t7606-merge-custom.sh
Commit message (Expand)AuthorAgeFilesLines
* tests: use "git foo" without dash in stringsNanako Shiraishi2008-09-091-1/+1
* t7606: fix custom merge testJunio C Hamano2008-08-231-2/+5
* Add a new test for using a custom merge strategyMiklos Vajna2008-07-291-0/+46