aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6406-merge-attr.sh
AgeCommit message (Expand)AuthorFilesLines
2024-01-24merge-ll: expose revision names to custom driversAntonin Delpeuch1-5/+11
2023-09-16merge-ort: lowercase a few error messagesJeff King1-1/+1
2023-09-14merge-ort: drop custom err() functionJeff King1-1/+2
2023-06-23t6406: skip "external merge driver getting killed by a signal" test on WindowsJunio C Hamano1-1/+1
2023-06-23ll-merge: killing the external merge driver aborts the mergeJunio C Hamano1-0/+23
2022-11-21unpack-file: fix ancient leak in create_temp_file()Ævar Arnfjörð Bjarmason1-0/+1
2022-08-26t64xx: convert 'test_create_repo' to 'git init'Elijah Newren1-2/+2
2022-02-16Merge branch 'en/remerge-diff'Junio C Hamano1-2/+7
2022-02-02merge-ort: capture and print ll-merge warnings in our preferred fashionElijah Newren1-2/+7
2021-12-13tests: simplify construction of large blocks of textEric Sunshine1-4/+4
2021-06-11ll_union_merge(): pass name labels to ll_xdl_merge()Jeff King1-1/+2
2021-06-11ll_binary_merge(): handle XDL_MERGE_FAVOR_UNIONJeff King1-0/+17
2020-11-19t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin1-13/+13
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin1-0/+3
2020-08-19Merge branch 'en/merge-tests'Junio C Hamano1-0/+207
2020-08-10Collect merge-related tests to t64xxElijah Newren1-0/+207