rename and update mergo module

Signed-off-by: Boban Acimovic <boban.acimovic@gmail.com>
2023-06-26 22:19:11 +02:00
parent 605942cb2c
commit b32264a1af
17 changed files with 244 additions and 69 deletions
--- a/cli/compose/loader/merge.go
+++ b/cli/compose/loader/merge.go
@ -4,8 +4,8 @@ import (
 	"reflect"
 	"sort"

+	"dario.cat/mergo"
 	"github.com/docker/cli/cli/compose/types"
-	"github.com/imdario/mergo"
 	"github.com/pkg/errors"
 )

--- a/cli/compose/loader/merge_test.go
+++ b/cli/compose/loader/merge_test.go
@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"

+	"dario.cat/mergo"
 	"github.com/docker/cli/cli/compose/types"
-	"github.com/imdario/mergo"
 	"gotest.tools/v3/assert"
 )