summaryrefslogtreecommitdiff
path: root/include/git2/errors.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/git2/errors.h')
-rw-r--r--include/git2/errors.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/git2/errors.h b/include/git2/errors.h
index 8ca900969..4eb9e94ef 100644
--- a/include/git2/errors.h
+++ b/include/git2/errors.h
@@ -64,6 +64,7 @@ typedef enum {
GITERR_STASH,
GITERR_CHECKOUT,
GITERR_FETCHHEAD,
+ GITERR_MERGE,
} git_error_t;
/**