比较目录的工具 (Windows 7)
声明：本页面是StackOverFlow热门问题的中英对照翻译，遵循CC BY-SA 4.0协议，如果您需要使用它，必须同样遵循CC BY-SA许可，注明原文地址和作者信息，同时你必须将它归于原作者（不是我）：StackOverFlow
原文地址: http://stackoverflow.com/questions/14138855/
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
Tool to compare directories (Windows 7)
提问by Mukul Goel
Due to some SVNmovement I got disconnected from SVN while I was in middle of a fairly large enhancement.
由于一些SVN运动，当我处于相当大的增强过程中时，我与 SVN 断开了连接。
Now I have my current workspace (with changes and disconnected from SVN) and new workspace (latest from SVN).
现在我有我当前的工作区（有变化并与 SVN 断开连接）和新工作区（来自 SVN 的最新工作区）。
I need to manually update the new workspace with the changes so I could check them in.
我需要使用更改手动更新新工作区，以便我可以将它们签入。
So I am looking out for a tool that can let me compare the two workspaces, tell for new files and folders and also updated files.
所以我正在寻找一种工具，它可以让我比较两个工作区，判断新文件和文件夹以及更新的文件。
Does a tool like this exist? If so, could you recommend a good one?
有这样的工具吗？如果是这样，你能推荐一个好的吗？
回答by richardtz
回答by The Bearded Llama
The tool that richardtz suggests is excellent.
richardtz 建议的工具非常好。
Another one that is amazing and comes with a 30 day free trial is Araxis Merge. This one does a 3 way merge and is much more feature complete than winmerge, but it is a commercial product.
另一个令人惊叹的并带有 30 天免费试用期的产品是Araxis Merge。这个进行 3 路合并，功能比 winmerge 完整得多，但它是一个商业产品。
You might also like to check out Scott Hanselman's developer tool list, which mentions a couple more in addition to winmerge
您可能还想查看 Scott Hanselman 的开发人员工具列表，其中除了 winmerge 之外还提到了一些
