]> ruderich.org/simon Gitweb - config/dotfiles.git/commitdiff
Use Apple's FileMerge for merge conflicts.
authorSimon Ruderich <simon@ruderich.com>
Fri, 29 Aug 2008 19:12:42 +0000 (21:12 +0200)
committerSimon Ruderich <simon@ruderich.org>
Fri, 29 Aug 2008 19:12:42 +0000 (21:12 +0200)

No differences found