2

我刚刚安装了 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/

任何想法？

4

1 回答 1

4

这是我的情况：

git config -l

（缩写输出）

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

我如何修复它：

git config --global --unset mergetool.opendiff.cmd
于 2013-12-03T05:33:23.233 回答