diff --git a/modes/smerge/evil-collection-smerge-mode.el b/modes/smerge/evil-collection-smerge-mode.el index 7d886f7..d352fd9 100644 --- a/modes/smerge/evil-collection-smerge-mode.el +++ b/modes/smerge/evil-collection-smerge-mode.el @@ -35,9 +35,9 @@ (defun evil-collection-smerge-mode-setup () "Setup up 'evil' bindings for 'smerge-mode'." (evil-collection-define-key 'normal 'smerge-mode-map - "gn" 'smerge-next + "gj" 'smerge-next "]]" 'smerge-next - "gp" 'smerge-prev + "gk" 'smerge-prev "[[" 'smerge-prev "ga" 'smerge-keep-all "gu" 'smerge-keep-upper