diff options
| author | Yuchen Pei <id@ypei.org> | 2023-06-28 19:54:44 +1000 |
|---|---|---|
| committer | Yuchen Pei <id@ypei.org> | 2023-06-28 19:54:44 +1000 |
| commit | b0e256586c24c6fb169d61e98302b11026ff10d2 (patch) | |
| tree | a62223150703df6c66e3c42448efd881366448f8 /emacs/.emacs.d/init/ycp-vc.el | |
| parent | 5142e4227a0d10f8e5481523710b2c17b2054889 (diff) | |
Some minor fixes
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 |