fixup! Add merge options menu

Author: stefanhaller

pkg/i18n/english.go

@@ -63,7 +63,6 @@ type TranslationSet struct {
 	ToggleTreeViewTooltip                 string
 	OpenDiffTool                          string
 	OpenMergeTool                         string
-	OpenMergeToolTooltip                  string
 	Refresh                               string
 	RefreshTooltip                        string
 	Push                                  string
@@ -1142,7 +1141,6 @@ func EnglishTranslationSet() *TranslationSet {
 		ToggleTreeViewTooltip:                "Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.\n\nThe default can be changed in the config file with the key 'gui.showFileTree'.",
 		OpenDiffTool:                         "Open external diff tool (git difftool)",
 		OpenMergeTool:                        "Open external merge tool",
-		OpenMergeToolTooltip:                 "Run `git mergetool`.",
 		Refresh:                              "Refresh",
 		RefreshTooltip:                       "Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`.",
 		Push:                                 "Push",