diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-08-06 18:05:00 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-08-06 18:05:00 +1000 |
| commit | 445a625b56a79be6cee7ec1ee35fe9f4fcc2daad (patch) | |
| tree | 1258e2bb1f5f486c109b9150e0805ded0d2fac90 /pkg/gui/keybindings.go | |
| parent | cd2c01d1cfb0236ccb7c94a8aae21726ef1283d1 (diff) | |
rename merging context to mergeConflicts
Diffstat (limited to 'pkg/gui/keybindings.go')
| -rw-r--r-- | pkg/gui/keybindings.go | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index 8c1a78dd2..9d02d636e 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -326,105 +326,105 @@ func (self *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBi Handler: self.scrollUpSecondary, }, { - ViewName: "merging", + ViewName: "mergeConflicts", Key: opts.GetKey(opts.Config.Universal.ScrollLeft), Handler: self.scrollLeftMain, Description: self.c.Tr.LcScrollLeft, Tag: "navigation", }, { - ViewName: "merging", + ViewName: "mergeConflicts", Key: opts.GetKey(opts.Config.Universal.ScrollRight), Handler: self.scrollRightMain, Description: self.c.Tr.LcScrollRight, Tag: "navigation", }, { - ViewName: "merging", + ViewName: "mergeConflicts", Key: opts.GetKey(opts.Config.Universal.Return), Handler: self.handleEscapeMerge, Description: self.c.Tr.ReturnToFilesPanel, }, { - ViewName: "merging", + ViewName: "mergeConflicts", Key: opts.GetKey(opts.Config.Files.OpenMergeTool), Handler: self.helpers.WorkingTree.OpenMergeTool, Description: self.c.Tr.LcOpenMergeTool, }, { - ViewName: "merging", + ViewName: "mergeConflicts", Key: opts.GetKey(opts.Config.Universal.Select), Handler: self.handlePickHunk, Description: self.c.Tr.PickHunk, }, { - ViewName: "merging", + ViewName: "mergeConflicts", Key: opts.GetKey(opts.Config.Main.PickBothHunks), Handler: self.handlePickAllHunks, Description: self.c.Tr.PickAllHunks, }, { - ViewName: "merging", + ViewName: "mergeConflicts", Key: opts.GetKey(opts.Config.Universal.PrevBlock), Handler: self.handleSelectPrevConflict, Description: self.c.Tr.PrevConflict, }, { - ViewName: "merging", + ViewName: "mergeConflicts", Key: opts.GetKey(opts.Config.Universal.NextBlock), Handler: self.handleSelectNextConflict, Description: self.c.Tr.NextConflict, }, { - ViewName: "merging", + ViewName: "mergeConflicts", Key: opts.GetKey(opts.Config.Universal.PrevItem), Handler: self.handleSelectPrevConflictHunk, Description: self.c.Tr.SelectPrevHunk, }, { - ViewName: "merging", + ViewName: "mergeConflicts", Key: opts.GetKey(opts.Config.Universal.NextItem), Handler: self.handleSelectNextConflictHunk, Description: self.c.Tr.SelectNextHunk, }, { - ViewName: "merging", + ViewName: "mergeConflicts", Key: opts.GetKey(opts.Config.Universal.PrevBlockAlt), Modifier: gocui.ModNone, Handler: self.handleSelectPrevConflict, }, { - ViewName: "merging", + ViewName: "mergeConflicts", Key: opts.GetKey(opts.Config.Universal.NextBlockAlt), Modifier: gocui.ModNone, Handler: self.handleSelectNextConflict, }, { - ViewName: "merging", + ViewName: "mergeConflicts", Key: opts.GetKey(opts.Config.Universal.PrevItemAlt), Modifier: gocui.ModNone, Handler: self.handleSelectPrevConflictHunk, }, { - ViewName: "merging", + ViewName: "mergeConflicts", Key: opts.GetKey(opts.Config.Universal.NextItemAlt), Modifier: gocui.ModNone, Handler: self.handleSelectNextConflictHunk, }, { - ViewName: "merging", + ViewName: "mergeConflicts", Key: opts.GetKey(opts.Config.Universal.Edit), Handler: self.handleMergeConflictEditFileAtLine, Description: self.c.Tr.LcEditFile, }, { - ViewName: "merging", + ViewName: "mergeConflicts", Key: opts.GetKey(opts.Config.Universal.OpenFile), Handler: self.handleMergeConflictOpenFileAtLine, Description: self.c.Tr.LcOpenFile, }, { - ViewName: "merging", + ViewName: "mergeConflicts", Key: opts.GetKey(opts.Config.Universal.Undo), Handler: self.handleMergeConflictUndo, Description: self.c.Tr.LcUndo, |