yup. protip:

Put this in your ~/.gitconfig

  [merge]
     tool = opendiff
 

then next time you get a merge conflict, just do:

  `git mergetool`

it will open xcode's FileMerge.app, which is the best mergetool I've ever used.