aboutsummaryrefslogtreecommitdiffstats
path: root/emacs
diff options
context:
space:
mode:
Diffstat (limited to 'emacs')
-rw-r--r--emacs/.emacs.d/init/ediff-init.org4
1 files changed, 4 insertions, 0 deletions
diff --git a/emacs/.emacs.d/init/ediff-init.org b/emacs/.emacs.d/init/ediff-init.org
index 4d6df76..588a605 100644
--- a/emacs/.emacs.d/init/ediff-init.org
+++ b/emacs/.emacs.d/init/ediff-init.org
@@ -1,5 +1,9 @@
#+TITLE: Ediff
+#+BEGIN_SRC emacs-lisp
+ (require 'ediff)
+#+END_SRC
+
Don't use a special frame for the ediff control buffer.
#+BEGIN_SRC emacs-lisp