diff options
| -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) " |