merge branch master

This commit is contained in:
Jesse Duffield
2018-08-11 15:09:37 +10:00
parent e46f3b3393
commit 7e141283f6
17 changed files with 388 additions and 251 deletions

1
Gopkg.lock generated
View File

@@ -288,6 +288,7 @@
"github.com/jesseduffield/gocui",
"github.com/tcnksm/go-gitconfig",
"gopkg.in/src-d/go-git.v4",
"gopkg.in/src-d/go-git.v4/plumbing",
"gopkg.in/src-d/go-git.v4/plumbing/object",
]
solver-name = "gps-cdcl"