diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 0000000..d7832ae
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,2 @@
+[merge]
+	conflictStyle = diff3