summaryrefslogtreecommitdiff
path: root/t/t6406-merge-attr.sh
AgeCommit message (Expand)AuthorFilesLines
2021-06-11ll_union_merge(): pass name labels to ll_xdl_merge()Libravatar Jeff King1-1/+2
2021-06-11ll_binary_merge(): handle XDL_MERGE_FAVOR_UNIONLibravatar Jeff King1-0/+17
2020-11-19t6[4-9]*: adjust the references to the default branch name "main"Libravatar Johannes Schindelin1-13/+13
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Libravatar Johannes Schindelin1-0/+3
2020-08-19Merge branch 'en/merge-tests'Libravatar Junio C Hamano1-0/+207
2020-08-10Collect merge-related tests to t64xxLibravatar Elijah Newren1-0/+207