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

Revert "git: Use vimdiff3 for merge"

Browse source 
This reverts commit 513c5f4dda.
This commit is contained in:
Sanchayan Maity 2020-10-06 17:27:36 +05:30
parent 160ed5b1c1
commit 3e3b3cd153
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

@ -18,7 +18,7 @@
[diff]
colorMoved = default
[merge]
tool = vimdiff3
tool = vimdiff
conflictstyle = diff3
ff = only
[mergetool]