| Age | Commit message (Expand) | Author | Files | Lines |
|---|
| 2025-04-08 | tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm | Elijah Newren | 1 | -6/+1 |
| 2024-11-21 | t: remove TEST_PASSES_SANITIZE_LEAK annotations | Patrick Steinhardt | 1 | -1/+0 |
| 2024-10-24 | merge: replace atoi() with strtol_i() for marker size validation | Usman Akinyemi | 1 | -0/+8 |
| 2024-06-20 | merge-ort: convert more error() cases to path_msg() | Elijah Newren | 1 | -1/+1 |
| 2024-06-20 | merge-ort: maintain expected invariant for priv member | Elijah Newren | 1 | -1/+41 |
| 2024-01-24 | merge-ll: expose revision names to custom drivers | Antonin Delpeuch | 1 | -5/+11 |
| 2023-09-16 | merge-ort: lowercase a few error messages | Jeff King | 1 | -1/+1 |
| 2023-09-14 | merge-ort: drop custom err() function | Jeff King | 1 | -1/+2 |
| 2023-06-23 | t6406: skip "external merge driver getting killed by a signal" test on Windows | Junio C Hamano | 1 | -1/+1 |
| 2023-06-23 | ll-merge: killing the external merge driver aborts the merge | Junio C Hamano | 1 | -0/+23 |
| 2022-11-21 | unpack-file: fix ancient leak in create_temp_file() | Ævar Arnfjörð Bjarmason | 1 | -0/+1 |
| 2022-08-26 | t64xx: convert 'test_create_repo' to 'git init' | Elijah Newren | 1 | -2/+2 |
| 2022-02-16 | Merge branch 'en/remerge-diff' | Junio C Hamano | 1 | -2/+7 |
| 2022-02-02 | merge-ort: capture and print ll-merge warnings in our preferred fashion | Elijah Newren | 1 | -2/+7 |
| 2021-12-13 | tests: simplify construction of large blocks of text | Eric Sunshine | 1 | -4/+4 |
| 2021-06-11 | ll_union_merge(): pass name labels to ll_xdl_merge() | Jeff King | 1 | -1/+2 |
| 2021-06-11 | ll_binary_merge(): handle XDL_MERGE_FAVOR_UNION | Jeff King | 1 | -0/+17 |
| 2020-11-19 | t6[4-9]*: adjust the references to the default branch name "main" | Johannes Schindelin | 1 | -13/+13 |
| 2020-11-19 | tests: mark tests relying on the current default for `init.defaultBranch` | Johannes Schindelin | 1 | -0/+3 |
| 2020-08-19 | Merge branch 'en/merge-tests' | Junio C Hamano | 1 | -0/+207 |
| 2020-08-10 | Collect merge-related tests to t64xx | Elijah Newren | 1 | -0/+207 |
