jdkaplan/dotfiles
1
0
Fork 0
Code Activity

git: Set mergetool to nvimdiff

Browse source
This commit is contained in:
Jeremy Kaplan 2021-10-14 09:51:33 -07:00
commit 52582d858b
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
git/config
View file

@ -19,6 +19,7 @@ defaultBranch = main
[merge] [merge]
conflictStyle = diff3 conflictStyle = diff3
ff = only ff = only
tool = nvimdiff
[pull] [pull]
ff = only ff = only