diff options
| author | Mark Kopenga <mkopenga@gmail.com> | 2018-08-16 07:16:32 +0200 |
|---|---|---|
| committer | Mark Kopenga <mkopenga@gmail.com> | 2018-08-16 07:16:32 +0200 |
| commit | 88e1a815fe5c4ddf21779ca4a93f029b7b9b9239 (patch) | |
| tree | 1a03be425b0ac411f3d38cceb0ce5511af22b68b /pkg/gui/merge_panel.go | |
| parent | 9abbfe5a43ea7b2a9758f910dd51d41ae43cf45b (diff) | |
Fixed comment on issue #137 from @jesseduffield
Diffstat (limited to 'pkg/gui/merge_panel.go')
| -rw-r--r-- | pkg/gui/merge_panel.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index 213bac739..1efea16da 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -232,11 +232,11 @@ func (gui *Gui) switchToMerging(g *gocui.Gui) error { func (gui *Gui) renderMergeOptions(g *gocui.Gui) error { return gui.renderOptionsMap(g, map[string]string{ - "↑ ↓": gui.Tr.SLocalize("selectHunk", "select hunk"), - "← →": gui.Tr.SLocalize("navigateConflicts", "navigate conflicts"), - "space": gui.Tr.SLocalize("pickHunk", "pick hunk"), - "b": gui.Tr.SLocalize("pickBothHunks", "pick both hunks"), - "z": gui.Tr.SLocalize("undo", "undo"), + "↑ ↓": gui.Tr.SLocalize("selectHunk"), + "← →": gui.Tr.SLocalize("navigateConflicts"), + "space": gui.Tr.SLocalize("pickHunk"), + "b": gui.Tr.SLocalize("pickBothHunks"), + "z": gui.Tr.SLocalize("undo"), }) } |