Fix mergetool
This commit is contained in:
parent
bc2381a650
commit
3b78fac2eb
1 changed files with 1 additions and 1 deletions
|
@ -8,7 +8,7 @@
|
|||
confirm = false
|
||||
prompt = true
|
||||
[merge]
|
||||
tool = vimdiff3
|
||||
tool = vimdiff
|
||||
[push]
|
||||
default = matching
|
||||
[alias]
|
||||
|
|
Loading…
Reference in a new issue