From b0e256586c24c6fb169d61e98302b11026ff10d2 Mon Sep 17 00:00:00 2001 From: Yuchen Pei Date: Wed, 28 Jun 2023 19:54:44 +1000 Subject: Some minor fixes --- emacs/.emacs.d/init/ycp-vc.el | 1 + 1 file changed, 1 insertion(+) (limited to 'emacs/.emacs.d/init/ycp-vc.el') 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 -- cgit v1.2.3