From 4f5befbb74aa70d57c8d583a50fdc433f79745c0 Mon Sep 17 00:00:00 2001 From: manojcchoudhary <36996445+manojcchoudhary@users.noreply.github.com> Date: Sat, 6 Mar 2021 21:12:27 +0530 Subject: [PATCH] Update merge.go --- go/cmd/dolt/commands/merge.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/cmd/dolt/commands/merge.go b/go/cmd/dolt/commands/merge.go index db42c6cb52..5b85ef78fd 100644 --- a/go/cmd/dolt/commands/merge.go +++ b/go/cmd/dolt/commands/merge.go @@ -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 ' and commit using {{.EmphasisLeft}}dolt commit -m {{.EmphasisRight}}") + cli.Println("hint: add affected tables using 'dolt add
' and commit using 'dolt commit -m '") cli.Println("fatal: Exiting because of active merge") return 1 }