Merge remote-tracking branch 'refs/remotes/origin/master'
1 file changed, 6 insertions(+), 0 deletions(-)
changed files
M emacs/init.el → emacs/init.el
@@ -427,6 +427,12 @@ :config (progn (add-to-list 'tramp-remote-path "/usr/local/sbin") (add-to-list 'tramp-remote-path "~/bin"))) +(use-package ediff + :defer t + :config (progn + (setq ediff-split-window-function 'split-window-horizontally + ediff-window-setup-function 'ediff-setup-windows-plain))) + ;;;; Indentation (setq-default tab-width 4