summaryrefslogtreecommitdiff
path: root/t/t6406-merge-attr.sh
Commit message (Expand)AuthorAgeFilesLines
* ll_union_merge(): pass name labels to ll_xdl_merge()Jeff King2021-06-111-1/+2
* ll_binary_merge(): handle XDL_MERGE_FAVOR_UNIONJeff King2021-06-111-0/+17
* t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-191-13/+13
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-191-0/+3
* Merge branch 'en/merge-tests'Junio C Hamano2020-08-191-2/+2
* Collect merge-related tests to t64xxElijah Newren2020-08-101-0/+207