Skip to content

Commit

Permalink
[emacs] ediff: setup better defaults for ediff
Browse files Browse the repository at this point in the history
Been using this a lot more with smerge for LLM code changes
  • Loading branch information
meain committed Dec 19, 2024
1 parent 188b509 commit 89be257
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions emacs/.config/emacs/init.el
Original file line number Diff line number Diff line change
Expand Up @@ -2228,6 +2228,12 @@ list of available pages."
:after forge
:commands (github-review-start github-review-forge-pr-at-point))

(use-package ediff
:after (evil-leader)
:config
(setq ediff-window-setup-function 'ediff-setup-windows-plain)
(setq ediff-split-window-function 'split-window-horizontally))

(use-package smerge-mode
:after (evil evil-leader)
:config
Expand Down

0 comments on commit 89be257

Please sign in to comment.