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

git: Use vimdiff3 for merge

Browse source 
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] [fetch]
prune = true prune = true
[merge] [merge]
tool = vimdiff tool = vimdiff3
conflictstyle = diff3 conflictstyle = diff3
[mergetool] [mergetool]
prompt = false prompt = false