在小牛和Xcode 5.0.1之后使用带有opendiff的git合并工具的错误

Question

我只是安装了OS和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/Content/Developer/

有什么想法吗？

Answer 1

这就是我的处境：

git config -l

(简略产出)

merge.tool=opendiff
mergetool.opendiff.cmd=/usr/bin/opendiff $2 $5 -merge $1

我是如何修正的：

git config --global --unset mergetool.opendiff.cmd