diff options
| author | Vicent Marti <vicent@github.com> | 2015-10-23 13:37:02 +0200 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2015-10-23 13:37:02 +0200 |
| commit | 7c0c21c3f35dc7b5667a9c16d4e3a2ddf1901f30 (patch) | |
| tree | 444c214b32d248e4452638478716f883b87bc22a /include/git2/patch.h | |
| parent | dc2cf3eb1a71700a064720618ed5df267cffcbac (diff) | |
| parent | 8683d31f080eb12fe769ab2363165ec17562c840 (diff) | |
| download | libgit2-7c0c21c3f35dc7b5667a9c16d4e3a2ddf1901f30.tar.gz | |
Merge pull request #3482 from ethomson/merge_fail_on_conflict
merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT
Diffstat (limited to 'include/git2/patch.h')
0 files changed, 0 insertions, 0 deletions