mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-07 08:50:34 -06:00
Code Issues Packages Projects Releases 115 Wiki Activity

Update merge.go

Browse Source
This commit is contained in:
manojcchoudhary
2021-03-06 21:12:27 +05:30
committed by GitHub
parent ff3b6b0659
commit 4f5befbb74
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go/cmd/dolt/commands/merge.go
View File

@@ -120,7 +120,7 @@ func (cmd MergeCmd) Exec(ctx context.Context, commandStr string, args []string,
return 1
} else if dEnv.IsMergeActive() {
cli.Println("error: Merging is not possible because you have not committed an active merge.")
cli.Println("hint: add affected tables using 'dolt add <table>' and commit using {{.EmphasisLeft}}dolt commit -m <msg>{{.EmphasisRight}}")
cli.Println("hint: add affected tables using 'dolt add <table>' and commit using 'dolt commit -m <msg>'")
cli.Println("fatal: Exiting because of active merge")
return 1
}