mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-29 03:06:35 -05:00
Code Issues Packages Projects Releases 159 Wiki Activity

Merge branch 'fulghum/cherry-pick' of https://github.com/dolthub/dolt into fulghum/cherry-pick

Browse Source
This commit is contained in:
Jason Fulghum
2023-06-13 13:00:16 -07:00
parent 12501bf919 a91152f88b
commit f28c2be53d
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/cmd/dolt/commands/cherry-pick.go
+1
View File
@@ -16,6 +16,7 @@ package commands
import (
"context"
"gopkg.in/src-d/go-errors.v1"
"github.com/dolthub/dolt/go/cmd/dolt/cli"
go/libraries/doltcore/merge/merge_rows.go
+1
View File
@@ -16,6 +16,7 @@ package merge
import (
"context"
"github.com/dolthub/go-mysql-server/sql"
"github.com/dolthub/dolt/go/libraries/doltcore/conflict"