From 363986c1e7ca5a2321383ed7f78e2fd83527d5e5 Mon Sep 17 00:00:00 2001
From: Ravi R Kiran <aine.marina@gmail.com>
Date: Mon, 4 Nov 2019 20:36:43 -0600
Subject: Try out vdiff as an alternative to ediff


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))
     )
-- 
cgit v0.10.1