diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2021-01-13 11:28:57 +0100 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2021-01-13 11:28:57 +0100 |
| commit | b7eafd6b952466fe19b198b461f3e98b543dcba9 (patch) | |
| tree | 93a6990e523d096e6d488c47e3f8c830e481db9e /vimrc | |
| parent | f700afd9bcacd4f91daa9ca28e8592bd8f5055db (diff) | |
Use kdiff3 for git, set default branch to main
Diffstat (limited to 'vimrc')
| -rw-r--r-- | vimrc | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1,5 +1,5 @@ " vimrc of Johannes Ranke -" Last Change: Tue Dec 15, 2020 at 12:02 PM +0100 +" Last Change: Wed Jan 13, 2021 at 10:16 AM +0100 " default settings (much is handled by tpope/sensible) {{{1 set ts=2 set sw=2 @@ -44,6 +44,9 @@ Plug 'seb-mueller/kwbdi.vim' " Version control Plug 'tpope/vim-fugitive' Plug 'airblade/vim-gitgutter' +Plug 'samoshkin/vim-mergetool' +let g:mergetool_layout = 'mr' +let g:mergetool_prefer_revision = 'local' " File system exploration Plug 'scrooloose/nerdtree' |