TortoiseMerge 不仅 显示 了你文件间的不同，而且还能让你解决存在的冲突或者采用修改。

If you're in two pane view, then you can only edit the file in the right pane (Mine). To apply changes made in the left file (Theirs), right click on the changed lines and select Context Menu → Use text block from 'theirs' . Then the changes from the left file are added to the right file.

有时候，你实际上需要双方的文本块，上下文菜单 → 使用双方的文本块 (这个先出现) 和 上下文菜单 → 使用双方的文本块 (这个后出现)可以满足你的要求。

你可以象在文本编辑器中一样编辑输出文件。这些被修改的行用铅笔图标标记。请注意，如果你要做上述基于行/块的修改，最好在开始编辑文件之前完成。因为在你开始编辑之后，TortoiseMerge 已经不能跟踪它与原始文件的关联了。

If you're in three pane view (sometimes called merge view) you can only edit the file in the bottom view (Merged). As in two pane view, you can right click on conflicted lines and either select Context Menu → Use text block from 'theirs' or Context Menu → Use text block from 'mine' . In addition, if you want both blocks, you can select Context Menu → Use text block from 'mine' before 'theirs' or Context Menu → Use text block from 'theirs' before 'mine' . According to the command you've selected, the changes are used in the resulting Merged file.

有时候在 Subversion 中的文件会被标记为冲突，但是当你用 TortoiseMerge 察看时，却没有显示冲突。这可能是你选择的空白处理方式造成的。如果你选择忽略行结束符或空白改变，这些行会用 冲突被忽略 图标标记。为了解决冲突，你仍旧需要选择你要使用的版本。