问题描述
Subversion，Git，Mercurial和其他支持三向合并(合并我的，他们的和基础"修订版)并支持解决冲突的图形工具.
Subversion, Git, Mercurial and others support three-way merges (combining mine, theirs, and the "base" revision) and support graphical tools to resolve conflicts.
您使用什么工具?您可以免费命名Windows，Mac OS X，Linux，Linux.
What tool do you use? Windows, Mac OS X, Linux, free or commercial, you name it.
以下是我开始使用或听说过的一些信息，只是为了开始对话:
Here's a few that I've used or heard of, just to get the conversation started:
- KDiff3
- DiffMerge
- P4Merge
- Meld
- Beyond Compare Pro.
(我认识到这有点像最佳差异工具，但不同之处在于，我明确地专注于三向合并工具； WinMerge 不适用列表.)
(I recognize that this is sort of like the Best Diff Tool, but it's different in that I explicitly focus on three-way merge tools; WinMerge is off the list, for example.)
推荐答案
KDiff3 开源，跨平台
用于Linux和Windows的相同界面，用于解决冲突的非常聪明的算法，用于自动解决冲突的正则表达式，与ClearCase，SVN，Git，MS Visual Studio集成，可编辑的合并文件，比较目录
Same interface for Linux and Windows, very smart algorithm for solving conflicts, regular expressions for automatically solving conflicts, integrate with ClearCase, SVN, Git, MS Visual Studio, editable merged file, compare directories
它的键盘导航功能很棒:ctrl-箭头用于浏览差异，ctrl-1、2、3进行合并.
Its keyboard-navigation is great: ctrl-arrows to navigate the diffs, ctrl-1, 2, 3 to do the merging.
此外，请参见 https://stackoverflow.com/a/2434482/42473
这篇关于最好的三向合并工具是什么?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持！