summaryrefslogtreecommitdiff
path: root/t/t6406-merge-attr.sh
AgeCommit message (Expand)Author
2021-12-13tests: simplify construction of large blocks of textEric Sunshine
2021-06-11ll_union_merge(): pass name labels to ll_xdl_merge()Jeff King
2021-06-11ll_binary_merge(): handle XDL_MERGE_FAVOR_UNIONJeff King
2020-11-19t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin
2020-08-19Merge branch 'en/merge-tests'Junio C Hamano
2020-08-10Collect merge-related tests to t64xxElijah Newren