summaryrefslogtreecommitdiff
path: root/t/t6404-recursive-merge.sh
AgeCommit message (Expand)AuthorFilesLines
2022-02-02merge-ort: capture and print ll-merge warnings in our preferred fashionLibravatar Elijah Newren1-2/+7
2021-02-17Merge branch 'ak/corrected-commit-date'Libravatar Junio C Hamano1-1/+4
2021-01-18commit-reach: use corrected commit dates in paint_down_to_common()Libravatar Abhishek Kumar1-1/+4
2020-11-19t6[4-9]*: adjust the references to the default branch name "main"Libravatar Johannes Schindelin1-3/+3
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Libravatar Johannes Schindelin1-0/+3
2020-10-26t6404, t6423: expect improved rename/delete handling in ort backendLibravatar Elijah Newren1-2/+12
2020-08-10Collect merge-related tests to t64xxLibravatar Elijah Newren1-0/+131