From a12f7f01ea8e1ee92d1123164b93611091dbf085 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Fri, 31 Jul 2015 00:05:03 -0400
Subject: Set smerge-diff-switches

---
 lisp/init-git.el | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lisp')

diff --git a/lisp/init-git.el b/lisp/init-git.el
index 3c8ce18..2f8c5ca 100644
--- a/lisp/init-git.el
+++ b/lisp/init-git.el
@@ -510,6 +510,8 @@ function."
 
 ;;; Other git
 
+(setq smerge-diff-switches '("-d" "-b" "-u"))
+
 (define-key km/git-map "m"
   (defhydra hydra-smerge (:hint nil)
     "
-- 
cgit v1.2.3