| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | recursive merge: add a recursion limit | Edward Thomson | 2015-11-25 | 1 | -0/+31 |
| * | merge: handle conflicts in recursive base building | Edward Thomson | 2015-11-25 | 1 | -0/+80 |
| * | merge tests: add complex recursive example | Edward Thomson | 2015-11-25 | 1 | -0/+28 |
| * | merge: add recursive test with conflicting contents | Edward Thomson | 2015-11-25 | 1 | -0/+23 |
| * | merge: add recursive test with three merge bases | Edward Thomson | 2015-11-25 | 1 | -0/+46 |
| * | merge: improve test names in recursive merge tests | Edward Thomson | 2015-11-25 | 1 | -8/+8 |
| * | merge: add a third-level recursive merge | Edward Thomson | 2015-11-25 | 1 | -0/+46 |
| * | merge: add a second-level recursive merge | Edward Thomson | 2015-11-25 | 1 | -2/+48 |
| * | merge: add simple recursive test | Edward Thomson | 2015-11-25 | 1 | -0/+110 |
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |