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

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 40406ce96b7419169e11c989ef0b0273fc6eb006..6d94fb7bcc1716e0b58005909966003700d7cf79 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -4,10 +4,12 @@
 . ../lib.sh
 
 # Generate gitconfig.
-m4 gitconfig -DHOME=$HOME
+m4 gitconfig -DHOME=$HOME -DOS=`os`
 
 # Link setup.
 link gitconfig ~/.gitconfig
 link gitignore ~/.gitignore
-link hgrc ~/.hgrc
-link hgignore ~/.hgignore
+if installed hg; then
+    link hgrc ~/.hgrc
+    link hgignore ~/.hgignore
+fi