How to always use OS X File Merge with git

Thanks to a tip in this video by Cocoa Samurai/Colin Wheeler: Distributed Version Control with Git on Vimeo: This is a screencast based off a talk I gave to the Des Moines Cocoaheads group. In this talk I tried to show why you should switch from Centralized Version Control, what is wrong with Subversion and …