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

diff --git a/gitconfig.m4 b/gitconfig.m4
index c9be20a001aa7312d422992ca5f6b8bc3ea130e1..51b5946ec36d8d8316aba4735f55776dc025c04b 100644 (file)
--- 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 965485cbc6a6d22aadfc32ac7ab073fe5c297fba..6d94fb7bcc1716e0b58005909966003700d7cf79 100755 (executable)
--- 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