diff options
| author | nulltoken <emeric.fermas@gmail.com> | 2013-01-10 12:11:49 +0100 |
|---|---|---|
| committer | nulltoken <emeric.fermas@gmail.com> | 2013-01-11 19:30:57 +0100 |
| commit | 635c235cf320428775529285bebf6f238fc71184 (patch) | |
| tree | b97ab7f4b6b78ae50a9166decc514521f5915a52 /include/git2/errors.h | |
| parent | cce2f16b9d676314f0505e40182ce760103db0a2 (diff) | |
| download | libgit2-635c235cf320428775529285bebf6f238fc71184.tar.gz | |
errors: Introduce EMERGECONFLICT error code
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 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, |