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