diff options
Diffstat (limited to 'git.go')
| -rw-r--r-- | git.go | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -3,7 +3,6 @@ package git /* #include <git2.h> #include <git2/sys/openssl.h> -#cgo pkg-config: libgit2 */ import "C" import ( @@ -77,8 +76,8 @@ const ( ErrNonFastForward ErrorCode = C.GIT_ENONFASTFORWARD // Name/ref spec was not in a valid format ErrInvalidSpec ErrorCode = C.GIT_EINVALIDSPEC - // Merge conflicts prevented operation - ErrMergeConflict ErrorCode = C.GIT_EMERGECONFLICT + // Checkout conflicts prevented operation + ErrConflict ErrorCode = C.GIT_ECONFLICT // Lock file prevented operation ErrLocked ErrorCode = C.GIT_ELOCKED // Reference value does not match expected |