sanchayanmaity/dotfiles
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nvim: Use vim-mergetool for merge conflicts

Browse source 
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
This commit is contained in:
Sanchayan Maity 2020-02-16 17:53:49 +05:30
parent bf1acc4991
commit 61498e8115
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
nvim/.config/nvim/init.vim
View file

@ -41,8 +41,7 @@ Plug 'rhysd/git-messenger.vim'
" Git logs
Plug 'rbong/vim-flog'
" Handle merge conflicts
Plug 'christoomey/vim-conflicted'
Plug 'whiteinge/diffconflicts'
Plug 'samoshkin/vim-mergetool'
" For tmux yank
Plug 'vim-utils/vim-husk'
" GDB
@ -266,6 +265,12 @@ nnoremap <Leader>g+ :Git stash pop<CR>:e<CR>
nnoremap <Leader>gf :exe ':Ggrep ' . expand('<cword>')<CR>
nnoremap <Leader>gF :Ggrep<SPACE>
nnoremap <Leader>gg :GGrep<SPACE>
nnoremap <Leader>ml :MergetoolDiffExchangeLeft<CR>
nnoremap <Leader>mr :MergetoolDiffExchangeRight<CR>
nnoremap <Leader>mu :MergetoolDiffExchangeUp<CR>
nnoremap <Leader>md :MergetoolDiffExchangeDown<CR>
nnoremap <Leader>mg :diffget<CR>
nnoremap <Leader>mp :diffput<CR>
" For gitgutter
nnoremap ]h :GitGutterNextHunk<CR>
nnoremap [h :GitGutterPrevHunk<CR>
@ -703,6 +708,10 @@ let g:loaded_ruby_provider = 0
let g:loaded_perl_provider = 0
let g:loaded_node_provider = 0
" Mergetool
let g:mergetool_layout = 'mr'
let g:mergetool_prefer_revision = 'unmodified'
" ----------------------------- Functions ------------------------------------
function! NvimGdbNoTKeymaps()
tnoremap <silent> <buffer> <Esc> <C-\><C-n>