X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/435306f68d07a5e26da738b65d0dad57e62456c0..b1a5d811d97e0faf409f4f6207f1d8e4502c0622:/.emacs.d/init.el

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index fe4b180..8d93b33 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -444,6 +444,14 @@ For disabling the behaviour for certain buffers and/or modes."
 ;; allow scrolling in Isearch
 (setq isearch-allow-scroll t)
 
+(use-feature vc
+  :bind ("C-x v C-=" . vc-ediff))
+
+(use-feature ediff
+  :config (add-hook 'ediff-after-quit-hook-internal 'winner-undo)
+  :custom ((ediff-window-setup-function 'ediff-setup-windows-plain)
+           (ediff-split-window-function 'split-window-horizontally)))
+
 
 ;;; General bindings