init

diff --git a/.gitconfig b/.gitconfig
new file mode 100644 (file)
index 0000000..0b649b0
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,4 @@
+[user]
+       email = jan.kratochvil@redhat.com
+[merge]
+       conflictstyle = diff3