go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-17 00:18:05 +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

8
pkg/commands/files.go
View File

@ -23,6 +23,14 @@ func (c *GitCommand) CatFile(fileName string) (string, error) {
return c.OSCommand.CatFile(fileName)
}
func (c *GitCommand) OpenMergeToolCmd() string {
return "git mergetool"
}
func (c *GitCommand) OpenMergeTool() error {
return c.OSCommand.RunCommand("git mergetool")
}
// StageFile stages a file
func (c *GitCommand) StageFile(fileName string) error {
return c.RunCommand("git add -- %s", c.OSCommand.Quote(fileName))