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

git: Use vimdiff3 for merge 

Use vimdiff3 instead of vimdiff. Might be better as mentioned below?
7c147b77d3
This commit is contained in:
Sanchayan Maity 2020-09-24 20:38:07 +05:30
parent b092402711
commit 513c5f4dda
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git/.gitconfig
View File

@ -15,7 +15,7 @@
[fetch]
prune = true
[merge]
tool = vimdiff
tool = vimdiff3
conflictstyle = diff3
[mergetool]
prompt = false