Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2021-10-12 | Merge branch 'en/pull-conflicting-options' into maint | 1 | -9/+9 | |
2021-07-22 | pull: abort by default when fast-forwarding is not possible | 1 | -9/+9 | |
2021-07-06 | t6402: preserve git exit status code | 1 | -68/+64 | |
2020-11-19 | t6[4-9]*: adjust the references to the default branch name "main" | 1 | -24/+24 | |
2020-11-19 | tests: mark tests relying on the current default for `init.defaultBranch` | 1 | -0/+3 | |
2020-10-26 | merge tests: expect slight differences in output for recursive vs. ort | 1 | -2/+12 | |
2020-10-26 | merge tests: expect improved directory/file conflict handling in ort | 1 | -27/+81 | |
2020-08-10 | Collect merge-related tests to t64xx | 1 | -0/+910 |