summaryrefslogtreecommitdiff
path: root/t/t7606-merge-custom.sh
AgeCommit message (Expand)AuthorFilesLines
2010-08-24t7606: Avoid using head as a file nameLibravatar Brian Gernhardt1-4/+4
2010-08-15merge: let custom strategies intervene in trivial mergesLibravatar Jonathan Nieder1-3/+33
2010-08-15t7606 (merge-theirs): modernize styleLibravatar Jonathan Nieder1-26/+40
2008-09-09tests: use "git foo" without dash in stringsLibravatar Nanako Shiraishi1-1/+1
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