Created
January 19, 2024 18:13
-
-
Save dmitrym0/840af2a21f86674cc1e2802f1c78aa96 to your computer and use it in GitHub Desktop.
Prot's ediff setup
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| ;; https://www.youtube.com/watch?v=pSvsAutseO0 | |
| (setq ediff-keep-variants nil) | |
| (setq ediff-make-buffers-readonly-at-startup nil) | |
| (setq ediff-merge-revisions-with-ancestor t) | |
| (setq ediff-show-clashes-only t) | |
| (setq ediff-split-window-function 'split-window-horizontally) | |
| (setq ediff-window-setup-function 'ediff-setup-windows-plain) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment