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

git: use nvim as mergetool (and difftool)

Browse source
This commit is contained in:
Fernando Schauenburg 2021-01-03 23:50:49 +01:00
parent 3ad4f7d72b
commit 57aaa79a30
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
files/gitconfig
View file

@ -52,6 +52,15 @@
[push] [push]
default = nothing default = nothing
[merge]
tool = vimdiff
[mergetool]
prompt = false
[mergetool "vimdiff"]
path = nvim
[color] [color]
ui = auto ui = auto