diff options
| author | Carlos Martín Nieto <[email protected]> | 2015-06-08 04:11:21 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <[email protected]> | 2015-06-08 04:11:21 +0200 |
| commit | 36e0a256fe79f87447bb730fda53e5cbc90eb47c (patch) | |
| tree | 202ffb84de0f87dd072194b554e18dfd56af0fc4 /git.go | |
| parent | 85fde1fcfbc3fd6000b8fa1a4041b4c314a92b2f (diff) | |
Update to libgit2 b6011e29
Diffstat (limited to 'git.go')
| -rw-r--r-- | git.go | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -76,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 |