diff options
| author | Alan Pearce | 2014-08-01 17:21:17 +0100 |
|---|---|---|
| committer | Alan Pearce | 2014-08-01 17:21:17 +0100 |
| commit | 7be6383e4cec5a4162c495a90b326d3be47ad354 (patch) | |
| tree | 0849c7c2fd45e321152cc263fd94ae6aa7e573ff | |
| parent | 01c866e881f21315cb24466e10648b5a25cb0532 (diff) | |
| download | nixfiles-7be6383e4cec5a4162c495a90b326d3be47ad354.tar.lz nixfiles-7be6383e4cec5a4162c495a90b326d3be47ad354.tar.zst nixfiles-7be6383e4cec5a4162c495a90b326d3be47ad354.zip | |
Emacs: Bind C-x v C to vc-resolve-conflicts
| -rw-r--r-- | tag-emacs/emacs.d/init.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tag-emacs/emacs.d/init.el b/tag-emacs/emacs.d/init.el index a284eefc..617f61ae 100644 --- a/tag-emacs/emacs.d/init.el +++ b/tag-emacs/emacs.d/init.el @@ -799,6 +799,7 @@ (req-package vc :defer t + :bind (("C-x v C" . vc-resolve-conflicts)) :config (progn (setq vc-follow-symlinks t))) |