 (use-package ediff-trees
   :bind (("C-c e" . my/ediff-trees-keymap)
          :map my/ediff-trees-keymap
+         ("e" . ediff-trees)
          ("n" . ediff-trees-examine-next)
          ("p" . ediff-trees-examine-previous)
          ("C-n" . ediff-trees-examine-next-regexp)

  (setq magit-popup-show-common-commands nil)
  (setq magit-log-show-refname-after-summary nil)
  (setq magit-no-confirm '())
  (setq magit-diff-refine-hunk t)
  (setq magit-process-find-password-functions 'magit-process-password-auth-source)
  (setq magit-auto-revert-tracked-only t)
  (setq magit-prefer-remote-upstream t)

;; Author: Dan Harms <danielrharms@gmail.com>
;; Created: Friday, February 27, 2015
;; Version: 1.0
;; Modified Time-stamp: <2016-11-14 10:41:56 dan.harms>
;; Modified by: Dan Harms
;; Keywords:

