From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 1 Mar 2009 15:34:33 +0000 (+0100)
Subject: git: Use opendiff as merge tool on Mac OS X.
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=56ee1004c09bfc6bd5174b09da3401e28b3dca3b;hp=56ee1004c09bfc6bd5174b09da3401e28b3dca3b;p=config%2Fdotfiles.git

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