| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |