diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-01-03 12:44:09 -0600 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2013-01-03 16:35:59 -0600 |
| commit | 42e50b5ed10fcebab794d35cefa1eedcd79072b6 (patch) | |
| tree | bf7f56bda58b5be43edf2f2ba2ea31aa49a51311 /include/git2/errors.h | |
| parent | b449a9ae8c9ac17652c5ab006859dd29b62a5b48 (diff) | |
| download | libgit2-42e50b5ed10fcebab794d35cefa1eedcd79072b6.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; /** |