https://bugzilla.redhat.com/show_bug.cgi?id=1434601#c5
[nethome.git] / .gitconfig
1 [user]
2         email = jan.kratochvil@redhat.com
3 [merge]
4         conflictstyle = diff3