diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-12-23 23:52:02 -0600 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-03-17 11:02:27 -0400 |
| commit | 7d307c1edc5430dce270302d539d6eab8ed054c7 (patch) | |
| tree | be9e36a90db9867bdcef1c40090b673be466b88f /include/git2 | |
| parent | 59f293146503bf5e615161fe89c305f080755dd1 (diff) | |
| download | libgit2-7d307c1edc5430dce270302d539d6eab8ed054c7.tar.gz | |
merge driver: test GIT_EMERGECONFLICT
When a `check` or `apply` callback function returns `GIT_EMERGECONFLICT`
stop and product a conflict.
Diffstat (limited to 'include/git2')
0 files changed, 0 insertions, 0 deletions