diff options
Diffstat (limited to 'pkg/commands/git_commands/branch.go')
| -rw-r--r-- | pkg/commands/git_commands/branch.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/commands/git_commands/branch.go b/pkg/commands/git_commands/branch.go index b8d562dae..d05738ef3 100644 --- a/pkg/commands/git_commands/branch.go +++ b/pkg/commands/git_commands/branch.go @@ -210,7 +210,7 @@ type MergeOpts struct { func (self *BranchCommands) Merge(branchName string, opts MergeOpts) error { cmdArgs := NewGitCmd("merge"). Arg("--no-edit"). - ArgIf(self.UserConfig.Git.Merging.Args != "", self.UserConfig.Git.Merging.Args). + Arg(strings.Fields(self.UserConfig.Git.Merging.Args)...). ArgIf(opts.FastForwardOnly, "--ff-only"). Arg(branchName). ToArgv() |