go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-12-01 22:52:01 +02:00
Code Issues Releases Activity

allow opening merge tool

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/gui/files_panel.go
View File

@@ -879,3 +879,15 @@ func (gui *Gui) handleToggleFileTreeView() error {
return nil
}
func (gui *Gui) handleOpenMergeTool() error {
return gui.ask(askOpts{
title: gui.Tr.MergeToolTitle,
prompt: gui.Tr.MergeToolPrompt,
handleConfirm: func() error {
return gui.runSubprocessWithSuspenseAndRefresh(
gui.OSCommand.ExecutableFromString(gui.GitCommand.OpenMergeToolCmd()),
)
},
})
}

14
pkg/gui/keybindings.go
View File

@@ -514,6 +514,13 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Handler: gui.handleToggleFileTreeView,
Description: gui.Tr.LcToggleTreeView,
},
{
ViewName: "files",
Contexts: []string{string(FILES_CONTEXT_KEY)},
Key: gui.getKey(config.Files.OpenMergeTool),
Handler: gui.handleOpenMergeTool,
Description: gui.Tr.LcOpenMergeTool,
},
{
ViewName: "branches",
Contexts: []string{string(LOCAL_BRANCHES_CONTEXT_KEY)},
@@ -1408,6 +1415,13 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Handler: gui.handleEscapeMerge,
Description: gui.Tr.ReturnToFilesPanel,
},
{
ViewName: "main",
Contexts: []string{string(MAIN_MERGING_CONTEXT_KEY)},
Key: gui.getKey(config.Files.OpenMergeTool),
Handler: gui.handleOpenMergeTool,
Description: gui.Tr.LcOpenMergeTool,
},
{
ViewName: "main",
Contexts: []string{string(MAIN_MERGING_CONTEXT_KEY)},