Show only clashes in ediff
This commit is contained in:
parent
d9180abf04
commit
192af9ca14
3
init.el
3
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 ()
|
||||
|
|
Loading…
Reference in New Issue