fixup! Add merge options menu

Author: lmnek

pkg/gui/controllers/helpers/working_tree_helper.go

@@ -291,17 +291,17 @@ func (self *WorkingTreeHelper) CreateMergeConflictMenu(selectedFilepaths []strin
 		Items: []*types.MenuItem{
 			{
 				LabelColumns: []string{
-					self.c.Tr.UseHead,
+					self.c.Tr.UseCurrentChanges,
 					cmdColor.Sprint("git merge-file --ours"),
 				},
 				OnPress: func() error {
 					return onMergeStrategySelected("--ours")
 				},
-				Key: 'h',
+				Key: 'c',
 			},
 			{
 				LabelColumns: []string{
-					self.c.Tr.UseIncoming,
+					self.c.Tr.UseIncomingChanges,
 					cmdColor.Sprint("git merge-file --theirs"),
 				},
 				OnPress: func() error {
@@ -311,7 +311,7 @@ func (self *WorkingTreeHelper) CreateMergeConflictMenu(selectedFilepaths []strin
 			},
 			{
 				LabelColumns: []string{
-					self.c.Tr.UseBoth,
+					self.c.Tr.UseBothChanges,
 					cmdColor.Sprint("git merge-file --union"),
 				},
 				OnPress: func() error {

pkg/i18n/english.go

@@ -901,9 +901,9 @@ type TranslationSet struct {
 	ViewMergeConflictOptions                 string
 	ViewMergeConflictOptionsTooltip          string
 	MergeConflictOptionsTitle                string
-	UseHead                                  string
-	UseIncoming                              string
-	UseBoth                                  string
+	UseCurrentChanges                        string
+	UseIncomingChanges                       string
+	UseBothChanges                           string
 }
 type Bisect struct {
 	MarkStart                   string
@@ -1978,9 +1978,9 @@ func EnglishTranslationSet() *TranslationSet {
 		ViewMergeConflictOptions:                 "View merge conflict options",
 		ViewMergeConflictOptionsTooltip:          "View options for resolving merge conflicts.",
 		MergeConflictOptionsTitle:                "Resolve merge conflicts",
-		UseHead:                                  "Use current changes",
-		UseIncoming:                              "Use incoming changes",
-		UseBoth:                                  "Use both",
+		UseCurrentChanges:                        "Use current changes",
+		UseIncomingChanges:                       "Use incoming changes",
+		UseBothChanges:                           "Use both",
 
 		Actions: Actions{
 			// TODO: combine this with the original keybinding descriptions (those are all in lowercase atm)