Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2020-02-16 | rebase: rename the two primary rebase backends | 1 | -2/+2 | |
2020-02-16 | rebase tests: repeat some tests using the merge backend instead of am | 1 | -2/+11 | |
2019-10-02 | merge-recursive: fix the diff3 common ancestor label for virtual commits | 1 | -0/+13 | |
2019-08-19 | merge-recursive: provide a better label for diff3 common ancestor | 1 | -0/+189 |