当我尝试将FileMerge作为Opendiff的GUI运行时,会出现错误:
我已经安装了XCode 4.6.3和Command Line Tools for Xcode April 2013。操作系统为OSX 10.7.5。
我尝试过以下两个链接提供的解决方案,但都没有成功: git diff with opendiff gives "Couldn't launch FileMerge" error Is filemerge still available after Xcode 4.3 installation? 当我进入“Xcode->打开开发工具”时,在选项列表中我没有看到“FileMerge”,而是有一个“更多开发工具”的链接,它将我带到这里: https://developer.apple.com/downloads/index.action?name=for%20Xcode%20- 如何让FileMerge工作?
$ git mergetool -t opendiff
Merging:
Gemfile
Gemfile.lock
...
Normal merge conflict for 'Gemfile':
{local}: modified file
{remote}: modified file
Hit return to start merge resolution tool (opendiff):
2013-12-26 20:00:20.248 opendiff[22367:e07] Couldn't find FileMerge
Gemfile seems unchanged.
Was the merge successful? [y/n] ^C
$
我已经安装了XCode 4.6.3和Command Line Tools for Xcode April 2013。操作系统为OSX 10.7.5。
我尝试过以下两个链接提供的解决方案,但都没有成功: git diff with opendiff gives "Couldn't launch FileMerge" error Is filemerge still available after Xcode 4.3 installation? 当我进入“Xcode->打开开发工具”时,在选项列表中我没有看到“FileMerge”,而是有一个“更多开发工具”的链接,它将我带到这里: https://developer.apple.com/downloads/index.action?name=for%20Xcode%20- 如何让FileMerge工作?
/Applications/Xcode.app/Contents/Applications/FileMerge.app
吗? - LaCls /Applications/Xcode.app/Contents/
不会显示一个Applications
文件夹。 - Eric Baldwinfind
命令)。 - LaC