From b38b0029309f4e7af5bbfd803d11743ac542ae30 Mon Sep 17 00:00:00 2001 From: Zach Musgrave Date: Tue, 12 Sep 2023 11:18:07 -0700 Subject: [PATCH] Update go/libraries/doltcore/sqle/dprocedures/dolt_merge.go Co-authored-by: Aaron Son --- go/libraries/doltcore/sqle/dprocedures/dolt_merge.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/libraries/doltcore/sqle/dprocedures/dolt_merge.go b/go/libraries/doltcore/sqle/dprocedures/dolt_merge.go index e864c7bfdb..a470ecc0c1 100644 --- a/go/libraries/doltcore/sqle/dprocedures/dolt_merge.go +++ b/go/libraries/doltcore/sqle/dprocedures/dolt_merge.go @@ -488,7 +488,7 @@ func createMergeSpec(ctx *sql.Context, sess *dsess.DoltSession, dbName string, a commitSpecStr, t, merge.WithSquash(apr.Contains(cli.SquashParam)), - merge.WithNoFf(apr.Contains(cli.NoFFParam)), + merge.WithNoFF(apr.Contains(cli.NoFFParam)), merge.WithForce(apr.Contains(cli.ForceFlag)), merge.WithNoCommit(apr.Contains(cli.NoCommitFlag)), merge.WithNoEdit(apr.Contains(cli.NoEditFlag)),