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/commands/files.go | |
parent | 2d8f7d2a7b9efa2767a4ec00878c8027e267d045 (diff) |
allow opening merge tool
Diffstat (limited to 'pkg/commands/files.go')
-rw-r--r-- | pkg/commands/files.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkg/commands/files.go b/pkg/commands/files.go index 579a3a252..9b4895710 100644 --- a/pkg/commands/files.go +++ b/pkg/commands/files.go @@ -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)) |