diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-01-03 12:44:09 -0600 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2013-01-04 17:47:51 +0100 |
| commit | 5a62d659bcd3dd529fde9ab7eae2e216cba055cf (patch) | |
| tree | 4e935871e103295dae9c9290e04fc15974480988 /include/git2/errors.h | |
| parent | 9651fdc29715543ec2d094a24ba92688bdfb7d76 (diff) | |
| download | libgit2-5a62d659bcd3dd529fde9ab7eae2e216cba055cf.tar.gz | |
MERGE_HEAD contents iterator
Diffstat (limited to 'include/git2/errors.h')
| -rw-r--r-- | include/git2/errors.h | 1 |
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; /** |