Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge: handle conflicts in recursive base building | Edward Thomson | 2015-11-25 | 1 | -1/+34 |
* | recursive: test conflict output during recursive merge | Edward Thomson | 2015-11-25 | 1 | -0/+51 |
![]() |
index : delta/libgit2.git | |
github.com: libgit2/libgit2.git |
summaryrefslogtreecommitdiff |
Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge: handle conflicts in recursive base building | Edward Thomson | 2015-11-25 | 1 | -1/+34 |
* | recursive: test conflict output during recursive merge | Edward Thomson | 2015-11-25 | 1 | -0/+51 |