From 9d552e73abda2b6efa47e9311e5b421a71eb241c Mon Sep 17 00:00:00 2001
From: jkratoch <>
Date: Tue, 2 Mar 2010 22:11:26 +0000
Subject: [PATCH] init

---
 .gitconfig | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .gitconfig

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