diff --git a/.vimrc b/.vimrc index 7b8f4c4da56f8f9c0d9c4a6d1395cac6114ed542..61d940636fd99b7ef5eff2bdbe00a60ed414b999 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 " }}}