 ;;  vc
 ;;  Diff-hl
 ;;  Ediff
+;;  Smerge
 
 ;;; vc
 (use-package vc

         (t
          (call-interactively #'ediff-buffers)))))))


(provide 'setup-diff)

;; Time-stamp: <2017-03-21 10:40:34 kmodi>

;; All things diff

