summaryrefslogtreecommitdiffstats
path: root/t/t6406-merge-attr.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'en/remerge-diff'Junio C Hamano2022-02-171-2/+7
|\
| * merge-ort: capture and print ll-merge warnings in our preferred fashionElijah Newren2022-02-021-2/+7
* | tests: simplify construction of large blocks of textEric Sunshine2021-12-131-4/+4
|/
* 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-201-13/+13
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-201-0/+3
* Merge branch 'en/merge-tests'Junio C Hamano2020-08-201-2/+2
* Collect merge-related tests to t64xxElijah Newren2020-08-111-0/+207