From b5827b7d8085769e22f1af8f21612641edcf3aaa Mon Sep 17 00:00:00 2001
From: Dawid Dziurla <dawidd0811@gmail.com>
Date: Mon, 3 Sep 2018 17:57:03 +0200
Subject: [PATCH] merge conflict effect fix

---
 pkg/gui/keybindings.go | 16 ++++++----------
 pkg/i18n/english.go    |  3 +++
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go
index 034f907bf..598465fc5 100644
--- a/pkg/gui/keybindings.go
+++ b/pkg/gui/keybindings.go
@@ -130,16 +130,6 @@ func (gui *Gui) GetKeybindings() []Binding {
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleFileOpen,
 			Description: gui.Tr.SLocalize("openFile"),
-		}, {
-			ViewName: "files",
-			Key:      's',
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleSublimeFileOpen,
-		}, {
-			ViewName: "files",
-			Key:      'v',
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleVsCodeFileOpen,
 		}, {
 			ViewName:    "files",
 			Key:         'i',
@@ -295,6 +285,12 @@ func (gui *Gui) GetKeybindings() []Binding {
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleRenameCommit,
 			Description: gui.Tr.SLocalize("RenameCommit"),
+		},{
+			ViewName: "commits",
+			Key: 'R',
+			Modifier: gocui.ModNone,
+			Handler: gui.handleRenameCommitEditor,
+			Description: gui.Tr.SLocalize("RenameCommitEditor"),
 		}, {
 			ViewName:    "commits",
 			Key:         'g',
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index 116c2258b..b6847a2b4 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -237,6 +237,9 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "RenameCommit",
 			Other: "Rename Commit",
+		}, &i18n.Message{
+			ID:    "RenameCommitEditor",
+			Other: "Rename Commit with editor",
 		}, &i18n.Message{
 			ID:    "PotentialErrInGetselectedCommit",
 			Other: "potential error in getSelected Commit (mismatched ui and state)",