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

git: 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:54:11 +05:30
parent 61498e8115
commit 7738d0c621
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
git/.gitconfig
View file

@ -11,5 +11,9 @@
smtpserver = /usr/bin/msmtp
[http]
sslVerify = false
[alias]
conflicted = !vim +Conflicted
[merge]
tool = vim_mergetool
conflictstyle=diff3
[mergetool "vim_mergetool"]
cmd = nvim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
trustExitCode = true