aboutsummaryrefslogtreecommitdiffstats
path: root/t/t7606-merge-custom.sh
AgeCommit message (Expand)AuthorFilesLines
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2024-06-11builtin/merge: fix leaking `struct cmdnames` in `get_strategy()`Patrick Steinhardt1-0/+1
2020-11-19t7[5-9]*: adjust the references to the default branch name "main"Johannes Schindelin1-1/+1
2010-08-24t7606: Avoid using head as a file nameBrian Gernhardt1-4/+4
2010-08-15merge: let custom strategies intervene in trivial mergesJonathan Nieder1-3/+33
2010-08-15t7606 (merge-theirs): modernize styleJonathan Nieder1-26/+40
2008-09-09tests: use "git foo" without dash in stringsNanako Shiraishi1-1/+1
2008-08-23t7606: fix custom merge testJunio C Hamano1-2/+5
2008-07-29Add a new test for using a custom merge strategyMiklos Vajna1-0/+46