From 9f7fa6c03c8bdadb6b931170601371cbbb4a0c46 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Mon, 26 Sep 2022 10:08:36 -0400 Subject: fix(grfn/emacs): Don't repeat git conflict navigation commands Change-Id: Iec2b3a2e2feeb5628badfdd97f9eac964d127e3b Reviewed-on: https://cl.tvl.fyi/c/depot/+/6788 Reviewed-by: grfn Autosubmit: grfn Tested-by: BuildkiteCI --- users/grfn/emacs.d/+bindings.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/users/grfn/emacs.d/+bindings.el b/users/grfn/emacs.d/+bindings.el index 57d0e63778..e05c191d33 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) ;;; -- cgit 1.4.1