fixup! Add merge options menu

Author: lmnek

pkg/gui/controllers/helpers/working_tree_helper.go

@@ -291,13 +291,13 @@ func (self *WorkingTreeHelper) CreateMergeConflictMenu(selectedFilepaths []strin
 		Items: []*types.MenuItem{
 			{
 				LabelColumns: []string{
-					self.c.Tr.UseHead,
+					self.c.Tr.UseCurrent,
 					cmdColor.Sprint("git merge-file --ours"),
 				},
 				OnPress: func() error {
 					return onMergeStrategySelected("--ours")
 				},
-				Key: 'h',
+				Key: 'c',
 			},
 			{
 				LabelColumns: []string{

pkg/i18n/english.go

@@ -901,7 +901,7 @@ type TranslationSet struct {
 	ViewMergeConflictOptions                 string
 	ViewMergeConflictOptionsTooltip          string
 	MergeConflictOptionsTitle                string
-	UseHead                                  string
+	UseCurrent                               string
 	UseIncoming                              string
 	UseBoth                                  string
 }
@@ -1978,7 +1978,7 @@ func EnglishTranslationSet() *TranslationSet {
 		ViewMergeConflictOptions:                 "View merge conflict options",
 		ViewMergeConflictOptionsTooltip:          "View options for resolving merge conflicts.",
 		MergeConflictOptionsTitle:                "Resolve merge conflicts",
-		UseHead:                                  "Use current changes",
+		UseCurrent:                               "Use current changes",
 		UseIncoming:                              "Use incoming changes",
 		UseBoth:                                  "Use both",