diff options
Diffstat (limited to 'emacs/.emacs.d/init/ycp-vc.el')
-rw-r--r-- | emacs/.emacs.d/init/ycp-vc.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/emacs/.emacs.d/init/ycp-vc.el b/emacs/.emacs.d/init/ycp-vc.el index d30fcc7..1f52df6 100644 --- a/emacs/.emacs.d/init/ycp-vc.el +++ b/emacs/.emacs.d/init/ycp-vc.el @@ -70,6 +70,7 @@ "=======" B ">>>>>>> B: Incoming")) (setq ediff-diff-options "-w") + (setq ediff-window-setup-function 'ediff-setup-windows-plain) ) (my-package vc-git |