From: Simon Ruderich <simon@ruderich.com>
Date: Fri, 29 Aug 2008 19:12:42 +0000 (+0200)
Subject: Use Apple's FileMerge for merge conflicts.
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;ds=sidebyside;h=3bd5dc94578c1c1026670024602d70f024501a53;hp=3bd5dc94578c1c1026670024602d70f024501a53;p=config%2Fdotfiles.git

Use Apple's FileMerge for merge conflicts.
---