| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge: recursive uses larger conflict markers | Edward Thomson | 2018-01-21 | 1 | -4/+4 |
| * | merge: handle conflicts in recursive base building | Edward Thomson | 2015-11-25 | 1 | -0/+31 |
| * | recursive: test conflict output during recursive merge | Edward Thomson | 2015-11-25 | 1 | -0/+30 |
| * | merge tests: move expected data into own file | Edward Thomson | 2015-11-25 | 1 | -0/+42 |
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |