 
 ;; * General Programming
 
+(use-package ediff
+  :init (setq ediff-diff-options "-w"
+              ediff-window-setup-function 'ediff-setup-windows-plain
+              ediff-split-window-function 'split-window-horizontally
+              ediff-show-clashes-only t)
+  :config (progn
+            (add-hook 'ediff-keymap-setup-hook
+                      '(lambda ()
+                        (bind-key "j" #'ediff-next-difference ediff-mode-map)
+                        (bind-key "k" #'ediff-previous-difference ediff-mode-map)))
+
+            (add-hook 'ediff-after-quit-hook-internal 'winner-undo)))
+
 (use-package git-commit
   :commands (global-git-commit-mode)
   :init (setq git-commit-style-convention-checks '(non-empty-second-line

(put 'upcase-region 'disabled nil)
(put 'downcase-region 'disabled nil)
(put 'narrow-to-region 'disabled nil)

(use-package calender
  :init (setq calendar-date-style 'iso

(use-package helm-pages
  :ensure t
  :commands (helm-pages))

(use-package imenu
  :init (setq imenu-use-markers t
              imenu-auto-rescan t
              imenu-auto-rescan-maxout 600000
              imenu-max-item-length 100
              imenu-use-popup-menu nil
              imenu-eager-completion-buffer t))

(use-package eyebrowse
  :ensure t
