我应该在 Windows 中与 Mercurial 一起使用哪个合并工具？
声明：本页面是StackOverFlow热门问题的中英对照翻译，遵循CC BY-SA 4.0协议，如果您需要使用它，必须同样遵循CC BY-SA许可，注明原文地址和作者信息，同时你必须将它归于原作者（不是我）：StackOverFlow
原文地址: http://stackoverflow.com/questions/235711/
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
Which merge tool should I use with Mercurial in Windows?
提问by Matías
I'm just starting with Mercurial and one of the things that I should do is select a merge tool. I was thinking to use WinMerge for that purpose, but I can't find the way to select this in particular. There are references for all the other merge tools around, but not for WinMerge.
我刚开始使用 Mercurial，我应该做的一件事就是选择一个合并工具。我正在考虑为此目的使用 WinMerge，但我找不到特别选择它的方法。周围有所有其他合并工具的参考，但不是 WinMerge。
So, should I use WinMerge or there's a better tool for that job (remember, I'm using Windows).
所以，我应该使用 WinMerge 还是有更好的工具来完成这项工作（请记住，我使用的是 Windows）。
采纳答案by Adam Liss
Take a look at kdiff3: http://kdiff3.sourceforge.net/
看看 kdiff3：http: //kdiff3.sourceforge.net/
It was originally designed for KDE/linux but has been ported to Windows. It will diff/merge up to 3 files remarkably intelligently, it does a great job of highlighting differences and suggesting how to merge the files, and it's about as intuitive as one could hope.
它最初是为 KDE/linux 设计的，但已移植到 Windows。它将非常智能地区分/合并多达 3 个文件，它在突出差异和建议如何合并文件方面做得很好，而且它与人们希望的一样直观。
Good luck!
祝你好运！
回答by polara
Beyond Compareis the gold standard for compare/merge tools. I've used it as well as many of the free ones mentioned and can tell you it's worth the $50.
Beyond Compare是比较/合并工具的黄金标准。我已经使用过它以及提到的许多免费的，并且可以告诉你它值 50 美元。
They have a page herethat discusses configuration for a variety of SCM packages.
他们有一个页面在这里讨论各种 SCM 包的配置。
回答by user2427
i use p4merge. http://www.perforce.com/perforce/products/merge.html
我使用 p4merge。 http://www.perforce.com/perforce/products/merge.html
it's beatiful and very clear.
它很漂亮，很清晰。
hereshows how can you configure.
这里显示了如何配置。
回答by Marcos Lara
I've used DiffMergewhich is available for free.
我使用了免费的DiffMerge。
Take a look at the screenshotsto get an idea of how it works, I found the interface pretty intuitive.
查看屏幕截图以了解其工作原理，我发现界面非常直观。
Good luck!
祝你好运！
