Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'internal/git2go/merge.go')
-rw-r--r--internal/git2go/merge.go5
1 files changed, 0 insertions, 5 deletions
diff --git a/internal/git2go/merge.go b/internal/git2go/merge.go
index e92856810..aca2035f7 100644
--- a/internal/git2go/merge.go
+++ b/internal/git2go/merge.go
@@ -16,11 +16,6 @@ const (
MergeRecursionLimit = 20
)
-var (
- // ErrInvalidArgument is returned in case the merge arguments are invalid.
- ErrInvalidArgument = errors.New("invalid parameters")
-)
-
// MergeCommand contains parameters to perform a merge.
type MergeCommand struct {
// Repository is the path to execute merge in.