about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGriffin Smith <root@gws.fyi>2022-09-26T14·08-0400
committerclbot <clbot@tvl.fyi>2022-09-26T14·15+0000
commit9f7fa6c03c8bdadb6b931170601371cbbb4a0c46 (patch)
tree8a87a186a5ddbdcb2a08a304d05869e9bdc61614
parent05b6f69cffd2ba1a6ede001cc39dae5127b743e9 (diff)
fix(grfn/emacs): Don't repeat git conflict navigation commands r/4968
Change-Id: Iec2b3a2e2feeb5628badfdd97f9eac964d127e3b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6788
Reviewed-by: grfn <grfn@gws.fyi>
Autosubmit: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
-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 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)
 
 ;;;