darkwiiplayer/darkrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix mergetool

Browse source
This commit is contained in:
Talia 2019-09-24 09:15:25 +02:00
parent bc2381a650
commit 3b78fac2eb
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gitconfig
View file

@ -8,7 +8,7 @@
confirm = false confirm = false
prompt = true prompt = true
[merge] [merge]
tool = vimdiff3 tool = vimdiff
[push] [push]
default = matching default = matching
[alias] [alias]