proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-12-25 09:48:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
8683d31f08
libgit2/include
History
Edward Thomson 8683d31f08 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.
2015-10-22 14:55:17 -04:00
..
git2 merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT 2015-10-22 14:55:17 -04:00
git2.h Include git2/transaction.h 2015-05-31 19:22:12 +02:00