Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ll_union_merge(): pass name labels to ll_xdl_merge() | Jeff King | 2021-06-11 | 1 | -1/+2 |
* | ll_binary_merge(): handle XDL_MERGE_FAVOR_UNION | Jeff King | 2021-06-11 | 1 | -0/+17 |
* | t6[4-9]*: adjust the references to the default branch name "main" | Johannes Schindelin | 2020-11-19 | 1 | -13/+13 |
* | tests: mark tests relying on the current default for `init.defaultBranch` | Johannes Schindelin | 2020-11-19 | 1 | -0/+3 |
* | Merge branch 'en/merge-tests' | Junio C Hamano | 2020-08-19 | 1 | -2/+2 |
* | Collect merge-related tests to t64xx | Elijah Newren | 2020-08-10 | 1 | -0/+207 |