xcode - 找不到 FileMerge(opendiff 工具)但我安装了 xcode 4.6

Question

当我尝试将 FileMerge 作为 Opendiff 的 GUI 运行时，我收到一个错误:

$ 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 -> Open Developer Tool 时，我在选项列表中没有看到 FileMerge。有一个 More Developer Tools 链接将我带到这里:https://developer.apple.com/downloads/index.action?name=for%20Xcode%20-

如何让 FileMerge 工作？

Answer 1

FileMerge 位于 Xcode 中。

从命令行:

cd /Applications/Xcode.app/Contents/Applications/
open .

打开后进入该目录:

1. 右键点击该应用
2. 选择“制作别名”
3. 将该别名移动到您的Applications 目录

一切就绪。