1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-07 22:02:56 +03:00

allow opening merge tool

This commit is contained in:
Jesse Duffield
2021-04-11 10:05:39 +10:00
parent 2d8f7d2a7b
commit 9f4433d8b5
5 changed files with 42 additions and 0 deletions

View File

@@ -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>",