Age | Commit message (Expand) | Author |
---|---|---|
2020-02-16 | rebase: rename the two primary rebase backends | Elijah Newren |
2020-02-16 | rebase tests: repeat some tests using the merge backend instead of am | Elijah Newren |
2019-10-02 | merge-recursive: fix the diff3 common ancestor label for virtual commits | Elijah Newren |
2019-08-19 | merge-recursive: provide a better label for diff3 common ancestor | Elijah Newren |