From 635c235cf320428775529285bebf6f238fc71184 Mon Sep 17 00:00:00 2001 From: nulltoken Date: Thu, 10 Jan 2013 12:11:49 +0100 Subject: [PATCH] errors: Introduce EMERGECONFLICT error code --- include/git2/errors.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/git2/errors.h b/include/git2/errors.h index 9e0a1a9e6..917f0699c 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,