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

nvim/git: Use vimdiff as merge tool & drop DiffConflicts

Browse source 
The conflict markers plugin is what we have been using all the time and
is useful even without resorting to merge tool. Drop the DiffConflicts
plugin and use vimdiff as the merge tool if at all we need to resort to
a full 3 way merge view.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
This commit is contained in:
Sanchayan Maity 2020-09-17 10:35:16 +05:30
parent ded93ed2fe
commit d8fc9facec
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
git/.gitconfig
View file

@ -13,9 +13,12 @@
[http] [http]
sslVerify = false sslVerify = false
[merge] [merge]
tool = diffconflicts tool = vimdiff
[mergetool "diffconflicts"] conflictstyle = diff3
cmd = nvim -c "DiffConflicts" "$MERGED" "$BASE" "$LOCAL" "$REMOTE" [mergetool]
prompt = false
[mergetool "vimdiff"]
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
trustExitCode = true trustExitCode = true
keepBackup = false keepBackup = false
[commit] [commit]

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

@ -22,7 +22,6 @@ Plug 'rhysd/git-messenger.vim'
Plug 'tpope/vim-fugitive' Plug 'tpope/vim-fugitive'
Plug 'airblade/vim-gitgutter' Plug 'airblade/vim-gitgutter'
Plug 'rhysd/conflict-marker.vim' Plug 'rhysd/conflict-marker.vim'
Plug 'whiteinge/diffconflicts'
Plug 'salcode/vim-interactive-rebase-reverse' Plug 'salcode/vim-interactive-rebase-reverse'
Plug 'stsewd/fzf-checkout.vim' Plug 'stsewd/fzf-checkout.vim'
" Boost vim command line mode " Boost vim command line mode