Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
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 |