about summary refs log tree commit diff
path: root/users
diff options
context:
space:
mode:
Diffstat (limited to 'users')
-rw-r--r--users/grfn/emacs.d/+bindings.el2
1 files changed, 2 insertions, 0 deletions
diff --git a/users/grfn/emacs.d/+bindings.el b/users/grfn/emacs.d/+bindings.el
index 57d0e6377823..e05c191d33c7 100644
--- a/users/grfn/emacs.d/+bindings.el
+++ b/users/grfn/emacs.d/+bindings.el
@@ -119,6 +119,8 @@ private/hlissner/snippets."
 
 (evil-set-command-property 'flycheck-next-error :repeat nil)
 (evil-set-command-property 'flycheck-prev-error :repeat nil)
+(evil-set-command-property 'smerge-next :repeat nil)
+(evil-set-command-property 'smerge-prev :repeat nil)
 
 ;;;