From fc84ea05d83c2512462ac6b50c68087e78699276 Mon Sep 17 00:00:00 2001
From: pspiagicw <pspiagicw@gmail.com>
Date: Wed, 8 Dec 2021 15:14:00 +0530
Subject: [PATCH] Change "gn"/"gp" to "gj"/"gk".

---
 modes/smerge/evil-collection-smerge-mode.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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