diff options
| author | Ravi R Kiran <aine.marina@gmail.com> | 2019-11-05 02:36:43 (GMT) |
|---|---|---|
| committer | Ravi R Kiran <aine.marina@gmail.com> | 2019-11-05 02:36:43 (GMT) |
| commit | 363986c1e7ca5a2321383ed7f78e2fd83527d5e5 (patch) | |
| tree | 0309036bb35f46e2a6a863e68ee2478b9789a067 | |
| parent | 38bad4d19282912741d318378c4e4e1b80b0cbac (diff) | |
| download | dotemacs-363986c1e7ca5a2321383ed7f78e2fd83527d5e5.zip dotemacs-363986c1e7ca5a2321383ed7f78e2fd83527d5e5.tar.gz dotemacs-363986c1e7ca5a2321383ed7f78e2fd83527d5e5.tar.bz2 | |
Try out vdiff as an alternative to ediff
| -rw-r--r-- | lisp/ravi-init-vc.el | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/lisp/ravi-init-vc.el b/lisp/ravi-init-vc.el index 29b0875..5a623ac 100644 --- a/lisp/ravi-init-vc.el +++ b/lisp/ravi-init-vc.el @@ -24,6 +24,14 @@ ;;; Code: +(use-package vdiff + :commands (vdiff-files + vdiff-files3 + vdiff-buffers + vdiff-buffers3 + vdiff-current-file + vdiff-merge-conflict)) + ;; Git (use-package magit :bind (("<M-f3>" . magit-status) @@ -55,6 +63,16 @@ (global-magit-file-mode 1) (unbind-key "C-x g" magit-file-mode-map) + (use-package vdiff-magit + :commands (vdiff-magit + vdiff-magit-dwim) + :init + (define-key magit-mode-map "e" 'vdiff-magit-dwim) + (define-key magit-mode-map "E" 'vdiff-magit) + (transient-suffix-put 'magit-dispatch "e" :description "vdiff (dwim)") + (transient-suffix-put 'magit-dispatch "e" :command 'vdiff-magit-dwim) + (transient-suffix-put 'magit-dispatch "E" :description "vdiff") + (transient-suffix-put 'magit-dispatch "E" :command 'vdiff-magit)) (use-package magit-svn :config (add-hook 'magit-mode-hook 'magit-svn-mode)) ) |