diff --git a/gitconfig b/gitconfig
index 6c356d7..b7e91b3 100644
--- a/gitconfig
+++ b/gitconfig
@@ -31,3 +31,9 @@
 	ui = auto
 [merge]
 	stat = true
+
+[difftool]
+    prompt = false
+
+[difftool "FileMerge"]
+    cmd = opendiff \"$LOCAL\" \"$REMOTE\"