| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge drivers: handle configured but not found driver | Edward Thomson | 2016-03-17 | 1 | -0/+18 |
| * | merge driver: remove `check` callback | Edward Thomson | 2016-03-17 | 1 | -124/+7 |
| * | merge driver: tests for set and unset merge attribute | Edward Thomson | 2016-03-17 | 1 | -1/+36 |
| * | merge driver: tests for custom default merge drivers | Edward Thomson | 2016-03-17 | 1 | -0/+59 |
| * | merge driver: test GIT_EMERGECONFLICT | Edward Thomson | 2016-03-17 | 1 | -0/+90 |
| * | merge driver: test GIT_PASSTHROUGH | Edward Thomson | 2016-03-17 | 1 | -0/+95 |
| * | merge driver: introduce custom merge drivers | Edward Thomson | 2016-03-17 | 1 | -0/+208 |
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |