Using OS X FileMerge with Git

On OSX Apple gives us the ever so useful FileMerge tool, which is my prefered tool to use when comparing two versions of a single file in OS X. To use this tool when working with Git simply open a terminal and enter the following command

git config --global merge.tool opendiff

This will open up FileMerge whenever Git has a conflict and needs your decision on what needs to be taken i.e. used.