Commit 635c235cf320428775529285bebf6f238fc71184
2013-01-10T12:11:49
errors: Introduce EMERGECONFLICT error code
diff --git a/include/git2/errors.h b/include/git2/errors.h
index 9e0a1a9..917f069 100644
--- 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,