mirror of
https://github.com/dolthub/dolt.git
synced 2026-05-03 11:30:28 -05:00
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
This commit is contained in:
@@ -183,7 +183,7 @@ func doltCommit(ctx *sql.Context,
|
||||
tx.mergeEditOpts,
|
||||
mo)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
return nil, nil, err
|
||||
}
|
||||
logrus.Tracef("staged and HEAD merge took %s", time.Since(start))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user