I just install OS X Maverics and Xcode 5.0.1 but now when I'm trying to use git mergetool
with opendiff
I'm getting this error:
Normal merge conflict for 'Assets/Scripts/Characters/MobAI.cs':
{local}: modified file
{remote}: modified file
Hit return to start merge resolution tool (opendiff):
2013-11-01 11:51:11.980 opendiff[1706:1007] too few arguments
2013-11-01 11:51:11.985 opendiff[1706:1007] usage: opendiff file1 file2 [-ancestor ancestorFile] [-merge mergeFile]
The xcode-select
path is /Applications/Xcode.app/Contents/Developer/
Any idea?
This was my situation:
(abbreviated output)
How I fixed it: