summaryrefslogtreecommitdiff
path: root/t/t7606-merge-custom.sh
AgeCommit message (Expand)AuthorFilesLines
2008-08-23t7606: fix custom merge testLibravatar Junio C Hamano1-2/+5
2008-07-29Add a new test for using a custom merge strategyLibravatar Miklos Vajna1-0/+46