我刚刚安装了OS X Maverics和Xcode 5.0.1，但现在当我试图将git mergetool与opendiff一起使用时，出现了以下错误：
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]
xcode-select路径是/applications/xcode.app/contents/developer/知道吗？
最佳答案
这就是我的处境：
git config -l
（缩写输出）
merge.tool=opendiff
mergetool.opendiff.cmd=/usr/bin/opendiff $2 $5 -merge $1
我是怎么解决的：
git config --global --unset mergetool.opendiff.cmd