diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2015-07-31 00:05:03 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2015-07-31 00:05:03 -0400 |
| commit | a12f7f01ea8e1ee92d1123164b93611091dbf085 (patch) | |
| tree | 2d5ce6c458934962fd36fe74bc51e2829d1a15e5 | |
| parent | 9e5e17027635bd66753d618829e9b8188583e021 (diff) | |
| download | emacs.d-a12f7f01ea8e1ee92d1123164b93611091dbf085.tar.gz | |
Set smerge-diff-switches
| -rw-r--r-- | lisp/init-git.el | 2 |
1 files changed, 2 insertions, 0 deletions
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) " |