From a60ee829ee6e08e0f72b08d9fbb74453fea3a8e1 Mon Sep 17 00:00:00 2001
From: Sami Samhuri <sami.samhuri@gmail.com>
Date: Thu, 14 Apr 2011 10:35:00 -0700
Subject: [PATCH] use opendiff for git difftool

---
 gitconfig | 6 ++++++
 1 file changed, 6 insertions(+)

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\"