aboutsummaryrefslogtreecommitdiff
path: root/t/t7606-merge-custom.sh
Commit message (Expand)AuthorAge
* t7606: fix custom merge testJunio C Hamano2008-08-23
* Add a new test for using a custom merge strategyMiklos Vajna2008-07-29