[user] email = jan.kratochvil@redhat.com [merge] conflictstyle = diff3