diff options
| author | Ravi R Kiran <aine.marina@gmail.com> | 2020-01-21 03:54:57 (GMT) |
|---|---|---|
| committer | Ravi R Kiran <aine.marina@gmail.com> | 2020-01-21 03:54:57 (GMT) |
| commit | d0b8647d43fd58551ea49f01b9085d4da040fac5 (patch) | |
| tree | 4c1e8eea4a2d52f3a3eaa38e3c02a6d817bf8ff7 /lisp | |
| parent | a6c5819f947f38aa6d3fa4dfdddebaba739060a3 (diff) | |
| download | dotemacs-d0b8647d43fd58551ea49f01b9085d4da040fac5.zip dotemacs-d0b8647d43fd58551ea49f01b9085d4da040fac5.tar.gz dotemacs-d0b8647d43fd58551ea49f01b9085d4da040fac5.tar.bz2 | |
vdiff's hydra is handy
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ravi-init-vc.el | 6 |
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 |