go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-21 12:16:54 +02:00
Code Issues Releases Activity

merge conflict effect fix

Browse Source
This commit is contained in:
Dawid Dziurla 2018-09-03 17:57:03 +02:00
parent 36874be45b
commit b5827b7d80
No known key found for this signature in database
GPG Key ID: 7B6D8368172E9B0B
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/gui/keybindings.go
View File

@ -130,16 +130,6 @@ func (gui *Gui) GetKeybindings() []Binding {
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.handleFileOpen, Handler: gui.handleFileOpen,
Description: gui.Tr.SLocalize("openFile"), 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", ViewName: "files",
Key: 'i', Key: 'i',
@ -295,6 +285,12 @@ func (gui *Gui) GetKeybindings() []Binding {
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.handleRenameCommit, Handler: gui.handleRenameCommit,
Description: gui.Tr.SLocalize("RenameCommit"), Description: gui.Tr.SLocalize("RenameCommit"),
},{
ViewName: "commits",
Key: 'R',
Modifier: gocui.ModNone,
Handler: gui.handleRenameCommitEditor,
Description: gui.Tr.SLocalize("RenameCommitEditor"),
}, { }, {
ViewName: "commits", ViewName: "commits",
Key: 'g', Key: 'g',

3
pkg/i18n/english.go
View File

@ -237,6 +237,9 @@ func addEnglish(i18nObject *i18n.Bundle) error {
}, &i18n.Message{ }, &i18n.Message{
ID: "RenameCommit", ID: "RenameCommit",
Other: "Rename Commit", Other: "Rename Commit",
}, &i18n.Message{
ID: "RenameCommitEditor",
Other: "Rename Commit with editor",
}, &i18n.Message{ }, &i18n.Message{
ID: "PotentialErrInGetselectedCommit", ID: "PotentialErrInGetselectedCommit",
Other: "potential error in getSelected Commit (mismatched ui and state)", Other: "potential error in getSelected Commit (mismatched ui and state)",