diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-10-06 21:00:36 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-10-06 21:58:41 +1100 |
| commit | 0aed47737c8f366c5e6895c57f0b193ff0eb43a3 (patch) | |
| tree | 1206e3075357a3f4561ba937859d69df7f3537db /go.mod | |
| parent | 6e076472b8fb2d052e0b1c35d3fff3dd263ae722 (diff) | |
bump go-git to fix invalid merge error
Diffstat (limited to 'go.mod')
| -rw-r--r-- | go.mod | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -14,8 +14,9 @@ require ( github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 github.com/golang/protobuf v1.3.2 // indirect github.com/google/go-cmp v0.3.1 // indirect + github.com/imdario/mergo v0.3.11 // indirect github.com/integrii/flaggy v1.4.0 - github.com/jesseduffield/go-git/v5 v5.1.1 + github.com/jesseduffield/go-git/v5 v5.1.2-0.20201006095850-341962be15a4 github.com/jesseduffield/gocui v0.3.1-0.20200930205305-1b445b9bd5da github.com/jesseduffield/termbox-go v0.0.0-20200823212418-a2289ed6aafe // indirect github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 @@ -36,9 +37,11 @@ require ( github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad github.com/stretchr/testify v1.4.0 github.com/tcnksm/go-gitconfig v0.1.2 - golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d // indirect + golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 // indirect + golang.org/x/net v0.0.0-20201002202402-0a1ea396d57c // indirect + golang.org/x/sys v0.0.0-20201005172224-997123666555 // indirect golang.org/x/text v0.3.2 - gopkg.in/yaml.v2 v2.2.7 + gopkg.in/yaml.v2 v2.3.0 ) replace github.com/go-git/go-git/v5 => github.com/jesseduffield/go-git/v5 v5.1.1 |