diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2015-05-29 16:42:40 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-05-29 16:42:40 +0200 |
| commit | 64be170d4786f5cc782d8d124cee0c1e2969d60a (patch) | |
| tree | b66b6fce8cacf621e23207dc67a597314f0dbe16 /include | |
| parent | 41a71c1a5eb891e7af1c7a3226c3c26e1a70b97c (diff) | |
| parent | 885b94aac06f17c55bd6f8df318e0cffb0104efa (diff) | |
| download | libgit2-64be170d4786f5cc782d8d124cee0c1e2969d60a.tar.gz | |
Merge pull request #3163 from ethomson/emergeconflict
Rename GIT_EMERGECONFLICT to GIT_ECONFLICT
Diffstat (limited to 'include')
| -rw-r--r-- | include/git2/errors.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/git2/errors.h b/include/git2/errors.h index 31fc6035a..dda0f8a57 100644 --- a/include/git2/errors.h +++ b/include/git2/errors.h @@ -38,7 +38,7 @@ typedef enum { GIT_EUNMERGED = -10, /**< Merge in progress prevented operation */ GIT_ENONFASTFORWARD = -11, /**< Reference was not fast-forwardable */ GIT_EINVALIDSPEC = -12, /**< Name/ref spec was not in a valid format */ - GIT_EMERGECONFLICT = -13, /**< Merge conflicts prevented operation */ + GIT_ECONFLICT = -13, /**< Checkout conflicts prevented operation */ GIT_ELOCKED = -14, /**< Lock file prevented operation */ GIT_EMODIFIED = -15, /**< Reference value does not match expected */ GIT_EAUTH = -16, /**< Authentication error */ |