dots/.gitconfig

3 lines
31 B
INI

[merge]
conflictStyle = diff3