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