diff --git a/.gitconfig b/.gitconfig
index 3fe0704f295cbcb57f3fa96b35cac3afa831b2d7..7635593ed43c76eb45e3d36e4c7e9ec57de1cea3 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -14,3 +14,9 @@
     fsckobjects = true
 [receive]
     fsckObjects = true
+[merge]
+	tool = kompare
+[diff]
+	tool = kompare
+[difftool]
+	prompt = false