git SourceTree 中的差异工具
声明：本页面是StackOverFlow热门问题的中英对照翻译，遵循CC BY-SA 4.0协议，如果您需要使用它，必须同样遵循CC BY-SA许可，注明原文地址和作者信息，同时你必须将它归于原作者（不是我）：StackOverFlow
原文地址: http://stackoverflow.com/questions/30628134/
Warning: these are provided under cc-by-sa 4.0 license. You are free to use/share it, But you must attribute it to the original authors (not me):
StackOverFlow
Diff tool in SourceTree
提问by Ali
I am using SourceTree as a Git client in my windows 7. I faced with a conflict and in order to resolve I click on Launch external merge toolas suggested. A window pops up very shortly and nothing happens then after!
我在 Windows 7 中使用 SourceTree 作为 Git 客户端。我遇到了冲突，为了解决我Launch external merge tool按照建议单击的问题。很快就会弹出一个窗口，然后什么也没发生！
I just tried it on my Mac OS and it shows external merge tool as expected.
我刚刚在我的 Mac OS 上尝试过它，它按预期显示了外部合并工具。
under Tools -> Options -> Diff -> External Diff / Merge dropdown box, System Defaultis selected.
在工具 -> 选项 -> 差异 -> 外部差异/合并下拉框下，System Default被选中。
I expect to see the diff merge tool but it never shows up in my windows, anyone know what could be the reason?
我希望看到差异合并工具，但它从未出现在我的窗口中，有人知道可能是什么原因吗？
采纳答案by Ricardo Amores
Do you have a diff tool installed on your system?
您的系统上是否安装了 diff 工具？
In Mac, when you install Xcode you get a diff tool named FileMerge, simple but sufficient in most of the cases. You can try WinMergefor Windows, I've used it in the past and it's pretty nice, and open source.
在 Mac 中，当你安装 Xcode 时，你会得到一个名为FileMerge的差异工具，在大多数情况下很简单但足够了。你可以试试WinMergefor Windows，我过去用过它，它非常好，而且是开源的。
You can also try the P4 Merge toolfrom Perforce which is offered for free.
您还可以试用Perforce 免费提供的P4 Merge 工具。
Both options can be selected as a Diff/Merge Tool in SourceTree.
这两个选项都可以选择作为 SourceTree 中的差异/合并工具。
回答by Deepak Shrivastava
Beyond Compare works great too on Mac. It supports Windows and Linux too, but I have not tried.
Beyond Compare 在 Mac 上也很好用。它也支持 Windows 和 Linux，但我没有尝试过。
You can download it from https://www.scootersoftware.com/download.phpand make sure you also install command line tools from top menu bar when you open Beyond Compare first time because Source Tree External Diff won't work without command line tools installed
您可以从https://www.scootersoftware.com/download.php下载它，并确保在第一次打开 Beyond Compare 时也从顶部菜单栏中安装命令行工具，因为如果没有命令行，源树外部差异将无法工作安装的工具
回答by Michael Fayad
I suggest installing Kdiff3 as a diff tool. It's the best I've seen so far.
我建议安装 Kdiff3 作为差异工具。这是迄今为止我见过的最好的。
Then set it as the diff tool on SourceTree:
然后将其设置为 SourceTree 上的差异工具：
- SourceTree/Tools/Options/Diff
- SourceTree/工具/选项/差异
The full tutorial is illustrated here: http://oliverbusse.notesx.net/hp.nsf/tutorial.xsp?documentId=C6A
完整教程如下所示：http: //oliverbusse.notesx.net/hp.nsf/tutorial.xsp?documentId=C6A
Note that you must change bothvalues for it to work. Otherwise it failed for me.
请注意，您必须更改这两个值才能使其工作。否则它对我来说失败了。
