diff --git a/config/git/config b/config/git/config
index fa9a2a0..be1b8fc 100644
--- a/config/git/config
+++ b/config/git/config
@@ -1,4 +1,7 @@
+# vim: ft=gitconfig
 [include]
+	path = tools/kdiff3
+	path = config.os
 	path = config.local
 
 [user]
diff --git a/config/git/tools/kdiff3 b/config/git/tools/kdiff3
new file mode 100644
index 0000000..8e39c17
--- /dev/null
+++ b/config/git/tools/kdiff3
@@ -0,0 +1,5 @@
+# vim: ft=gitconfig
+[merge]
+	tool = kdiff3
+[diff]
+	tool = kdiff3