errors: Introduce EMERGECONFLICT error code

635c235c · nulltoken · cce2f16b · 635c235c
Commit 635c235c authored Jan 10, 2013 by nulltoken
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 0 deletions

include/git2/errors.h
+1 -0

No files found.
--- a/include/git2/errors.h
+++ b/include/git2/errors.h
@@ -31,6 +31,7 @@ enum {
 	GIT_EUNMERGED = -10,
 	GIT_ENONFASTFORWARD = -11,
 	GIT_EINVALIDSPEC = -12,
+	GIT_EMERGECONFLICT = -13,

 	GIT_PASSTHROUGH = -30,
 	GIT_ITEROVER = -31,