X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=51b5946ec36d8d8316aba4735f55776dc025c04b;hb=56ee1004c09bfc6bd5174b09da3401e28b3dca3b;hp=c9be20a001aa7312d422992ca5f6b8bc3ea130e1;hpb=71b7c3d3914974cd860814f1e9ba8d7fb4211590;p=config%2Fdotfiles.git

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