+--nomcheck
[nethome.git] / .gitconfig
1 [user]
2         email = jan.kratochvil@redhat.com
3 [merge]
4         conflictstyle = diff3