From 98f5c6da03a8aee629400f8f34f2139105514874 Mon Sep 17 00:00:00 2001
From: Bradley Small <vc.Bradley.Small@lowes.com>
Date: Wed, 20 Nov 2019 14:30:26 -0500
Subject: [PATCH] storing vimdiff merge info
---
.vimrc | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.vimrc b/.vimrc
index 7b8f4c4..61d9406 100644
--- a/.vimrc
+++ b/.vimrc
@@ -435,6 +435,12 @@ nnoremap <F8> :call UpdateTags()
" Fugitive gitlab setting --------------------------------- {{{
let g:fugitive_gitlab_domains = ['https://git.qoto.org']
+
+" Use vimdiff as merge tool
+" git mergetool
+" git config merge.tool vimdiff
+" git config merge.conflictstyle diff3
+" git config mergetool.prompt false
" }}}
--
GitLab