feat(emacs): Configure Ediff
- Restore window configuration on quit. - Very simple, half-broken helper for resolving Syncthing conflicts. - Doesn't automatically delete the conflict file after resolve. }:\
This commit is contained in:
@@ -51,6 +51,7 @@
|
||||
(require 'syd-completion)
|
||||
(require 'syd-custom)
|
||||
(require 'syd-display-startup-time)
|
||||
(require 'syd-ediff)
|
||||
(require 'syd-editing)
|
||||
(require 'syd-eshell)
|
||||
(require 'syd-evil)
|
||||
@@ -60,6 +61,6 @@
|
||||
(require 'syd-projects)
|
||||
(require 'syd-scratch)
|
||||
(require 'syd-smartparens)
|
||||
(require 'syd-tramp)
|
||||
(require 'syd-tooling)
|
||||
(require 'syd-tramp)
|
||||
(require 'syd-ui)
|
||||
|
||||
Reference in New Issue
Block a user