This conflictstyle seems to be easier for me when doing three-way merges
in some very complex cases where vimdiff or kdiff with 4 panes open
doesn't help enough.
[log]
decorate = true
[diff]
[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
tool = kdiff3
mnemonicprefix = true
[difftool]
prompt = false
[merge]
tool = vimdiff
[mergetool]
prompt = false
[push]
[mergetool]
prompt = false
[push]