fixup! Add merge options menu

Author: lmnek

pkg/config/app_config.go

@@ -272,6 +272,7 @@ func computeMigratedConfig(path string, content []byte, changes *ChangesSet) ([]
 		{[]string{"gui", "skipUnstageLineWarning"}, "skipDiscardChangeWarning"},
 		{[]string{"keybinding", "universal", "executeCustomCommand"}, "executeShellCommand"},
 		{[]string{"gui", "windowSize"}, "screenMode"},
+		{[]string{"keybinding", "files", "openMergeTool"}, "openMergeOptions"},
 	}
 
 	for _, pathToReplace := range pathsToReplace {

pkg/gui/controllers/files_controller.go

@@ -1029,11 +1029,11 @@ func (self *FilesController) createStashMenu() error {
 func (self *FilesController) openMergeConflictMenu(nodes []*filetree.FileNode) error {
 	normalizedNodes := normalisedSelectedNodes(nodes)
 
-	fileNodes := lo.Filter(normalizedNodes, func(node *filetree.FileNode, _ int) bool {
-		return node.File != nil
+	fileNodesWithConflicts := lo.Filter(normalizedNodes, func(node *filetree.FileNode, _ int) bool {
+		return node.File != nil && node.File.HasInlineMergeConflicts
 	})
 
-	filepaths := lo.Map(fileNodes, func(node *filetree.FileNode, _ int) string {
+	filepaths := lo.Map(fileNodesWithConflicts, func(node *filetree.FileNode, _ int) string {
 		return node.GetPath()
 	})