1 files changed, 31 insertions, 29 deletions
diff --git a/pkg/gui/controllers/merge_conflicts_controller.go b/pkg/gui/controllers/merge_conflicts_controller.go
index 730826ba8..e0d4cae06 100644
--- a/pkg/gui/controllers/merge_conflicts_controller.go
+++ b/pkg/gui/controllers/merge_conflicts_controller.go
@@ -28,14 +28,24 @@ func NewMergeConflictsController(
 func (self *MergeConflictsController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
 	bindings := []*types.Binding{
 		{
-			Key:         opts.GetKey(opts.Config.Universal.Edit),
-			Handler:     self.HandleEditFile,
-			Description: self.c.Tr.EditFile,
+			Key:         opts.GetKey(opts.Config.Universal.Select),
+			Handler:     self.withRenderAndFocus(self.HandlePickHunk),
+			Description: self.c.Tr.PickHunk,
 		},
 		{
-			Key:         opts.GetKey(opts.Config.Universal.OpenFile),
-			Handler:     self.HandleOpenFile,
-			Description: self.c.Tr.OpenFile,
+			Key:         opts.GetKey(opts.Config.Main.PickBothHunks),
+			Handler:     self.withRenderAndFocus(self.HandlePickAllHunks),
+			Description: self.c.Tr.PickAllHunks,
+		},
+		{
+			Key:         opts.GetKey(opts.Config.Universal.PrevItem),
+			Handler:     self.withRenderAndFocus(self.PrevConflictHunk),
+			Description: self.c.Tr.SelectPrevHunk,
+		},
+		{
+			Key:         opts.GetKey(opts.Config.Universal.NextItem),
+			Handler:     self.withRenderAndFocus(self.NextConflictHunk),
+			Description: self.c.Tr.SelectNextHunk,
 		},
 		{
 			Key:         opts.GetKey(opts.Config.Universal.PrevBlock),
@@ -50,18 +60,26 @@ func (self *MergeConflictsController) GetKeybindings(opts types.KeybindingsOpts)
 			Display:     true,
 		},
 		{
-			Key:         opts.GetKey(opts.Config.Universal.PrevItem),
-			Handler:     self.withRenderAndFocus(self.PrevConflictHunk),
-			Description: self.c.Tr.SelectPrevHunk,
+			Key:         opts.GetKey(opts.Config.Universal.Undo),
+			Handler:     self.withRenderAndFocus(self.HandleUndo),
+			Description: self.c.Tr.Undo,
+			Tooltip:     self.c.Tr.UndoMergeResolveTooltip,
 			Display:     true,
 		},
 		{
-			Key:         opts.GetKey(opts.Config.Universal.NextItem),
-			Handler:     self.withRenderAndFocus(self.NextConflictHunk),
-			Description: self.c.Tr.SelectNextHunk,
+			Key:         opts.GetKey(opts.Config.Universal.Edit),
+			Handler:     self.HandleEditFile,
+			Description: self.c.Tr.EditFile,
+			Tooltip:     self.c.Tr.EditFileTooltip,
 			Display:     true,
 		},
 		{
+			Key:         opts.GetKey(opts.Config.Universal.OpenFile),
+			Handler:     self.HandleOpenFile,
+			Description: self.c.Tr.OpenFile,
+			Tooltip:     self.c.Tr.OpenFileTooltip,
+		},
+		{
 			Key:     opts.GetKey(opts.Config.Universal.PrevBlockAlt),
 			Handler: self.withRenderAndFocus(self.PrevConflict),
 		},
@@ -90,26 +108,10 @@ func (self *MergeConflictsController) GetKeybindings(opts types.KeybindingsOpts)
 			Tag:         "navigation",
 		},
 		{
-			Key:         opts.GetKey(opts.Config.Universal.Undo),
-			Handler:     self.withRenderAndFocus(self.HandleUndo),
-			Description: self.c.Tr.Undo,
-			Display:     true,
-		},
-		{
 			Key:         opts.GetKey(opts.Config.Files.OpenMergeTool),
 			Handler:     self.c.Helpers().WorkingTree.OpenMergeTool,
 			Description: self.c.Tr.OpenMergeTool,
-		},
-		{
-			Key:         opts.GetKey(opts.Config.Universal.Select),
-			Handler:     self.withRenderAndFocus(self.HandlePickHunk),
-			Description: self.c.Tr.PickHunk,
-			Display:     true,
-		},
-		{
-			Key:         opts.GetKey(opts.Config.Main.PickBothHunks),
-			Handler:     self.withRenderAndFocus(self.HandlePickAllHunks),
-			Description: self.c.Tr.PickAllHunks,
+			Tooltip:     self.c.Tr.OpenMergeToolTooltip,
 			Display:     true,
 		},
 		{