summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ravi-init-vc.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ravi-init-vc.el b/lisp/ravi-init-vc.el
index 5a623ac..c40dcb6 100644
--- a/lisp/ravi-init-vc.el
+++ b/lisp/ravi-init-vc.el
@@ -30,7 +30,11 @@
vdiff-buffers
vdiff-buffers3
vdiff-current-file
- vdiff-merge-conflict))
+ vdiff-merge-conflict)
+ :bind (:map vdiff-3way-mode-map
+ ("M-r" . vdiff-hydra/body)
+ :map vdiff-mode-map
+ ("M-r" . vdiff-hydra/body)))
;; Git
(use-package magit