commit ae1dfb3d9c15f79817c16d4eb14ae0ecc37fa569 parent 092628d6bcde3973e3439ba56158790fcd381b87 Author: Thomas Frössman <thomasf@jossystem.se> Date: Sun, 3 Nov 2019 22:10:51 +0100 dev: config ediff/magit diff a bit Diffstat:
| M | minimal-init/init.el | | | 7 | ++++++- |
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/minimal-init/init.el b/minimal-init/init.el @@ -30,7 +30,12 @@ display-buffer-alist '((".*" (display-buffer-reuse-window display-buffer-same-window))) - enable-local-variables nil) + enable-local-variables nil + ediff-window-setup-function 'ediff-setup-windows-plain + ediff-diff-options "-w" + magit-diff-refine-hunk 'all + ;;ediff-merge-split-window-function ediff-split-window-function + ) (require 'subr-x)