]> git.proxmox.com Git - libgit2.git/commitdiff
projects / libgit2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc2cf3e 8683d31)
Merge pull request #3482 from ethomson/merge_fail_on_conflict
authorVicent Marti <vicent@github.com>
Fri, 23 Oct 2015 11:37:02 +0000 (13:37 +0200)
committerVicent Marti <vicent@github.com>
Fri, 23 Oct 2015 11:37:02 +0000 (13:37 +0200)
merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT


Trivial merge
The git library used in some Proxmox tool chains