summaryrefslogtreecommitdiff
path: root/t/t7606-merge-custom.sh
AgeCommit message (Expand)Author
2010-08-24t7606: Avoid using head as a file nameBrian Gernhardt
2010-08-16merge: let custom strategies intervene in trivial mergesJonathan Nieder
2010-08-16t7606 (merge-theirs): modernize styleJonathan Nieder
2008-09-10tests: use "git foo" without dash in stringsNanako Shiraishi
2008-08-24t7606: fix custom merge testJunio C Hamano
2008-07-30Add a new test for using a custom merge strategyMiklos Vajna