From d335e2661729aa64aa94691fb9f4ed58c036d438 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Fri, 25 Nov 2016 17:00:59 +0100 Subject: [PATCH] bound smerge-mode to key - bound to C-c t S-s - check it out! Minor mode to simplify editing output from the diff3 program. Signed-off-by: Andreas Gerler --- bba.org | 1 + 1 file changed, 1 insertion(+) diff --git a/bba.org b/bba.org index 37e29556..01178842 100644 --- a/bba.org +++ b/bba.org @@ -2645,6 +2645,7 @@ character before any spaces." (define-key bba/toggle "p" 'smartparens-mode) (define-key bba/toggle "r" 'rainbow-delimiters-mode) (define-key bba/toggle "s" 'flyspell-mode) + (define-key bba/toggle "\S-s" 'smerge-mode) (define-key bba/toggle "t" 'toggle-truncate-lines) (define-key bba/toggle "v" 'visual-line-mode) (define-key bba/toggle "\S-w" 'which-function-mode) -- 2.47.3