diff --git a/init.el b/init.el index dd9be53..fae2608 100644 --- a/init.el +++ b/init.el @@ -537,7 +537,8 @@ (use-package ediff :init (setq ediff-diff-options "-w" ediff-window-setup-function 'ediff-setup-windows-plain - ediff-split-window-function 'split-window-horizontally) + ediff-split-window-function 'split-window-horizontally + ediff-show-clashes-only t) :config (progn (add-hook 'ediff-keymap-setup-hook '(lambda ()