Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | commit-graph: Support lookups of entries in a commit-graph | lhchavez | 2021-01-10 | 1 | -0/+0 |
* | apply tests: ensure we can patch a modified file | Edward Thomson | 2018-11-05 | 1 | -0/+0 |
* | Add failing test case for virtual commit merge base issue | Edward Thomson | 2018-02-04 | 26 | -0/+9 |
* | Introduce additional criss-cross merge branches | Edward Thomson | 2018-02-04 | 68 | -0/+11 |
* | merge: handle conflicts in recursive base building | Edward Thomson | 2015-11-25 | 24 | -0/+8 |
* | merge tests: add complex recursive example | Edward Thomson | 2015-11-25 | 11 | -6/+11 |
* | merge: add recursive test with conflicting contents | Edward Thomson | 2015-11-25 | 8 | -0/+9 |
* | merge: add recursive test with three merge bases | Edward Thomson | 2015-11-25 | 27 | -0/+19 |
* | merge: add a third-level recursive merge | Edward Thomson | 2015-11-25 | 12 | -0/+12 |
* | merge: add a second-level recursive merge | Edward Thomson | 2015-11-25 | 11 | -0/+9 |
* | merge: add simple recursive test | Edward Thomson | 2015-11-25 | 68 | -0/+121 |