]> ruderich.org/simon Gitweb - config/dotfiles.git/search
Use Apple's FileMerge for merge conflicts.