I sometimes have to make git merges on the console. Up until now, for resolving conflicts, I was using Xcode 3's FileMerge (you can open it on the console using the 'opendiff' command). If conflicts show, I use 'git mergetool' which automatically invokes opendiff for each of the conflicting files.
However, Xcode 4 features a much nicer mergetool component for resolving conflicts. I believe this component is part of the Xcode 4 executable, rather than standalone. It allows you to preview the merged file, and directly edit merged code on a case-by-case basis, which is a very useful.
Is there any way to use the Xcode 4 mergetool when using 'git mergetool' from the Terminal?
I cannot find an executable for this tool inside the Xcode 4 bundle. Any hack that achieves this would be welcome.