anthonycicc/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Wiki Activity

Remove vimdiff, cause we don't use vim anymore

Browse source
This commit is contained in:
zendesk-acicchetti 2021-04-30 10:00:17 -04:00
parent 15821c1117
commit 730ab418e7
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
git/gitconfig
View file

@ -19,12 +19,5 @@
follow = true follow = true
[pull] [pull]
rebase = true rebase = true
[diff]
tool = vimdiff
[merge]
tool = vimdiff
conflictstyle = diff3
[mergetool "vimdiff"]
cmd = nvim -d $BASE $LOCAL $REMOTE
[init] [init]
defaultBranch = main defaultBranch = main