From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 1 Mar 2009 15:34:33 +0000 (+0100)
Subject: git: Use opendiff as merge tool on Mac OS X.
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=56ee1004c09bfc6bd5174b09da3401e28b3dca3b;p=config%2Fdotfiles.git

git: Use opendiff as merge tool on Mac OS X.
---

diff --git a/gitconfig.m4 b/gitconfig.m4
index c9be20a..51b5946 100644
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -20,4 +20,9 @@
 	# Custom commands.
 	glog = log --pretty=oneline --graph --all
 
+[merge]
+IF(OS, darwin)
+	tool = opendiff
+FI
+
 # vim: ft=gitconfig
diff --git a/setup.sh b/setup.sh
index 965485c..6d94fb7 100755
--- a/setup.sh
+++ b/setup.sh
@@ -4,7 +4,7 @@
 . ../lib.sh
 
 # Generate gitconfig.
-m4 gitconfig -DHOME=$HOME
+m4 gitconfig -DHOME=$HOME -DOS=`os`
 
 # Link setup.
 link gitconfig ~/.gitconfig