diff --git a/.emacs.d/config/ediff.el b/.emacs.d/config/ediff.el
new file mode 100644
index 0000000..24f3680
--- /dev/null
+++ b/.emacs.d/config/ediff.el
@@ -0,0 +1,10 @@
+(use-package ediff
+  :config
+  (setq diff-switches               "-u"
+        ediff-custom-diff-options   "-U3"
+        ediff-split-window-function 'split-window-horizontally
+        ediff-window-setup-function 'ediff-setup-windows-plain)
+  :hook
+  (ediff-startup . ediff-toggle-wide-display)
+  (ediff-cleanup . ediff-toggle-wide-display)
+  (ediff-suspend . ediff-toggle-wide-display))
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 5e000c8..b53b1ee 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -62,6 +62,7 @@ symbols, which are converted to strings, and suffixed with \".el\"."
                         c
                         calendar
                         dev
+                        ediff
                         functions
                         git
                         gpg
diff --git a/.gitignore.d/emacs b/.gitignore.d/emacs
index a5a0019..3f30cf4 100644
--- a/.gitignore.d/emacs
+++ b/.gitignore.d/emacs
@@ -4,6 +4,7 @@
 !/.emacs.d/config/calendar.el
 !/.emacs.d/config/c.el
 !/.emacs.d/config/dev.el
+!/.emacs.d/config/ediff.el
 !/.emacs.d/config/functions.el
 !/.emacs.d/config/git.el
 !/.emacs.d/config/gpg.el