windows 安装后如何将 WinMerge 与 TortoiseSvn 集成？
声明：本页面是StackOverFlow热门问题的中英对照翻译，遵循CC BY-SA 4.0协议，如果您需要使用它，必须同样遵循CC BY-SA许可，注明原文地址和作者信息，同时你必须将它归于原作者（不是我）：StackOverFlow
原文地址: http://stackoverflow.com/questions/9578697/
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
How to integrate WinMerge with TortoiseSvn after installation?
提问by Rakesh Juyal
When you install winmerge after TortoiseSVN it gives you the option of associating winmerge with Tortoise. But if we install TortoiseSVN after winmerge how can we associate Winmerge to be used instead of Tortoise default diff viewer.
当您在 TortoiseSVN 之后安装 winmerge 时，它为您提供了将 winmerge 与 Tortoise 关联的选项。但是如果我们在 winmerge 之后安装 TortoiseSVN，我们如何关联 Winmerge 来代替 Tortoise 默认的差异查看器。
回答by Uwe Keim
You can open the TortoiseSVN settings and manually enter it:
可以打开TortoiseSVN设置，手动输入：
My command line from the screenshot above is:
我上面截图中的命令行是：
C:\Program Files (x86)\WinMerge\WinMergeU.exe -e -x -ub -dl %bname -dr %yname %base %mine
C:\Program Files (x86)\WinMerge\WinMergeU.exe -e -x -ub -dl %bname -dr %yname %base %mine
If you install TortoiseSVN after WinMerge, probably the easiest way would be to uninstall and re-install WinMerge again.
如果您在 WinMerge 之后安装 TortoiseSVN，可能最简单的方法是卸载并重新安装 WinMerge。
回答by tobylaroni
You can also use WinMerge for merging changes. In the settings window (as above) under Merge Tool, enter:
您还可以使用 WinMerge 来合并更改。在合并工具下的设置窗口（如上）中，输入：
32-bit os
32 位操作系统
C:\Program Files\WinMerge\WinMergeU.exe -e -x -ub -dl %tname -dr %yname %theirs %mine
64-bit os
64 位操作系统
C:\Program Files (x86)\WinMerge\WinMergeU.exe -e -x -ub -dl %tname -dr %yname %theirs %mine
Then you'll get the remote file in the left pane, your local (changed) file in the right pane.
然后，您将在左窗格中获得远程文件，在右窗格中获得本地（已更改）文件。
回答by Shiva127
As of 2017, command line parameters as slightly changed. You should use (for 64-bit OS):
截至 2017 年，命令行参数略有变化。您应该使用（对于 64 位操作系统）：
Diff Viewer
差异查看器
C:\Program Files (x86)\WinMerge\WinMergeU.exe -e -x -u -wl -dl %bname -dr %yname %base %mine
With:
和：
-eenables you to close WinMerge with a single Esckey press.-xcloses WinMerge (after displaying an information dialog) when you start a comparison of identical files.-uprevents WinMerge from adding either path (left or right) to the Most Recently Used (MRU) list.-wlopens the left side as read-only.-dl %bnamespecifies a description of the original file in the left side title bar.-dr %ynamespecifies a description of your own file in the right side title bar.%basespecifies the left side file with the original file.%minespecifies the right side file with your own file.
-e使您可以通过一次Esc按键关闭 WinMerge 。-x当您开始比较相同的文件时关闭 WinMerge（在显示信息对话框后）。-u阻止 WinMerge 将任一路径（左或右）添加到最近使用 (MRU) 列表。-wl以只读方式打开左侧。-dl %bname在左侧标题栏中指定原始文件的描述。-dr %yname在右侧标题栏中指定您自己的文件的描述。%base用原始文件指定左侧文件。%mine使用您自己的文件指定右侧文件。
Merge Tool
合并工具
C:\Program Files (x86)\WinMerge\WinMergeU.exe -e -x -u -wl -dl %tname -dr %yname %theirs %mine %merged
With the same options as above except:
使用与上述相同的选项，除了：
-dl %tnamespecifies a description of the repository file in the left side title bar.%theirsspecifies the left side file with the repository file.%mergedspecifies the conflicted file, the result of the merge operation.
-dl %tname在左侧标题栏中指定存储库文件的描述。%theirs使用存储库文件指定左侧文件。%merged指定冲突文件，合并操作的结果。
