Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2021-12-30 | merge-ort: fix bug with renormalization and rename/delete conflicts | Elijah Newren | 1 | -0/+26 |
2020-11-19 | t6[4-9]*: adjust the references to the default branch name "main" | Johannes Schindelin | 1 | -7/+7 |
2020-11-19 | tests: mark tests relying on the current default for `init.defaultBranch` | Johannes Schindelin | 1 | -0/+3 |
2020-08-10 | t6418: tighten delete/normalize conflict testcase | Elijah Newren | 1 | -1/+2 |
2020-08-10 | Collect merge-related tests to t64xx | Elijah Newren | 1 | -0/+203 |