mirror of
https://git.proxmox.com/git/libgit2
synced 2025-08-13 16:52:39 +00:00
errors: Introduce EMERGECONFLICT error code
This commit is contained in:
parent
cce2f16b9d
commit
635c235cf3
@ -31,6 +31,7 @@ enum {
|
||||
GIT_EUNMERGED = -10,
|
||||
GIT_ENONFASTFORWARD = -11,
|
||||
GIT_EINVALIDSPEC = -12,
|
||||
GIT_EMERGECONFLICT = -13,
|
||||
|
||||
GIT_PASSTHROUGH = -30,
|
||||
GIT_ITEROVER = -31,
|
||||
|
Loading…
Reference in New Issue
Block a user