[log]
decorate = true
[diff]
- ; diff.tool kdiff3 useful for 'git diffall'
+ ; diff.tool kdiff3 useful for 'git diffall'
tool = kdiff3
mnemonicprefix = true
[difftool]
prompt = false
[merge]
tool = vimdiff
+ conflictstyle = diff3
[mergetool]
prompt = false
[push]