From 36e0a256fe79f87447bb730fda53e5cbc90eb47c Mon Sep 17 00:00:00 2001 From: Carlos Martín Nieto Date: Mon, 8 Jun 2015 04:11:21 +0200 Subject: Update to libgit2 b6011e29 --- git.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'git.go') diff --git a/git.go b/git.go index 5f69837..ae65cb7 100644 --- a/git.go +++ b/git.go @@ -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 -- cgit v1.2.3