From b7eafd6b952466fe19b198b461f3e98b543dcba9 Mon Sep 17 00:00:00 2001
From: Johannes Ranke <jranke@uni-bremen.de>
Date: Wed, 13 Jan 2021 11:28:57 +0100
Subject: Use kdiff3 for git, set default branch to main

---
 vimrc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'vimrc')

diff --git a/vimrc b/vimrc
index 9e995a4..d03e749 100644
--- a/vimrc
+++ b/vimrc
@@ -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'
-- 
cgit v1.2.1