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