diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-11 10:05:39 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-11 10:21:53 +1000 |
| commit | 9f4433d8b55e1878610fd06d39ffd3ffaa623e79 (patch) | |
| tree | 602370b2f03da4004ee77948170f1db2a0aaa40b /pkg/config | |
| parent | 2d8f7d2a7b9efa2767a4ec00878c8027e267d045 (diff) | |
allow opening merge tool
Diffstat (limited to 'pkg/config')
| -rw-r--r-- | pkg/config/user_config.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go index 377ed05c0..22a31f02d 100644 --- a/pkg/config/user_config.go +++ b/pkg/config/user_config.go @@ -177,6 +177,7 @@ type KeybindingFilesConfig struct { ViewResetOptions string `yaml:"viewResetOptions"` Fetch string `yaml:"fetch"` ToggleTreeView string `yaml:"toggleTreeView"` + OpenMergeTool string `yaml:"openMergeTool"` } type KeybindingBranchesConfig struct { @@ -401,6 +402,7 @@ func GetDefaultConfig() *UserConfig { ViewResetOptions: "D", Fetch: "f", ToggleTreeView: "`", + OpenMergeTool: "M", }, Branches: KeybindingBranchesConfig{ CopyPullRequestURL: "<c-y>", |