diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-10-22 14:39:20 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-10-22 14:55:17 -0400 |
| commit | 8683d31f080eb12fe769ab2363165ec17562c840 (patch) | |
| tree | 444c214b32d248e4452638478716f883b87bc22a /include/git2/sys/commit.h | |
| parent | dc2cf3eb1a71700a064720618ed5df267cffcbac (diff) | |
| download | libgit2-8683d31f080eb12fe769ab2363165ec17562c840.tar.gz | |
merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT
Provide a new merge option, GIT_MERGE_TREE_FAIL_ON_CONFLICT, which
will stop on the first conflict and fail the merge operation with
GIT_EMERGECONFLICT.
Diffstat (limited to 'include/git2/sys/commit.h')
0 files changed, 0 insertions, 0 deletions