diff options
| author | Carlos Martín Nieto <[email protected]> | 2015-08-31 13:49:17 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <[email protected]> | 2015-08-31 13:55:46 +0200 |
| commit | f72db33baf9a47fc8b0d0ad8e83881eba235b532 (patch) | |
| tree | 0869cd25b8ea03495f35bcb42eb908cc72afb6af /git.go | |
| parent | 157593f38da780c4f6cb6dc61275b9b36a3327bf (diff) | |
| parent | c6c2e9389fd2148d20f2e283000f5b4204dbcdc8 (diff) | |
Merge branch 'next'
Diffstat (limited to 'git.go')
| -rw-r--r-- | git.go | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -77,8 +77,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 |