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

[config/dotfiles.git] / setup.sh

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