errors: Introduce EMERGECONFLICT error code

This commit is contained in:
nulltoken 2013-01-10 12:11:49 +01:00
parent cce2f16b9d
commit 635c235cf3

View File

@ -31,6 +31,7 @@ enum {
GIT_EUNMERGED = -10,
GIT_ENONFASTFORWARD = -11,
GIT_EINVALIDSPEC = -12,
GIT_EMERGECONFLICT = -13,
GIT_PASSTHROUGH = -30,
GIT_ITEROVER = -31,