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

[config/dotfiles.git] / gitconfig.m4

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