我如何配置 TortoiseGit 以使用 Meld 进行差异、合并和冲突？
How do I configure TortoiseGit to use Meld for diff, merge and conflicts?
我已经尝试了一个简单的配置来用 Meld for Windows 替换原生的 TortoiseGit 查看器来进行比较、合并和冲突操作。对于这些功能，我需要向 Meld 传递哪些额外参数？
像这样：
meld.exe --diff %base %mine
%base The original file without your changes
%bname The window title for the base file
%mine Your own file, with your changes
%yname The window title for your file
%bpath Full path to the original file
%ypath Full path to your file
%brev The revision of the original file, if available
%yrev The revision of the second file, if available
见https://tortoisegit.org/docs/tortoisegit/tgit-dug-settings.html
在 meld 3.16.2 下测试
差异：
C:\Program Files (x86)\Meld\Meld.exe %base %mine
合并：
C:\Program Files (x86)\Meld\Meld.exe %mine %base %theirs --output %merged
(meld一开始在middle pane中显示%base文件内容，meld修改保存middle pane内容后将middle pane内容保存到%merged file。)
或
C:\Program Files (x86)\Meld\Meld.exe %mine %merged %theirs
另见 https://gitlab.com/tortoisegit/tortoisegit/issues/2698#note_37137238
我已经尝试了一个简单的配置来用 Meld for Windows 替换原生的 TortoiseGit 查看器来进行比较、合并和冲突操作。对于这些功能，我需要向 Meld 传递哪些额外参数？
像这样：
meld.exe --diff %base %mine
%base The original file without your changes
%bname The window title for the base file
%mine Your own file, with your changes
%yname The window title for your file
%bpath Full path to the original file
%ypath Full path to your file
%brev The revision of the original file, if available
%yrev The revision of the second file, if available
见https://tortoisegit.org/docs/tortoisegit/tgit-dug-settings.html
在 meld 3.16.2 下测试
差异：
C:\Program Files (x86)\Meld\Meld.exe %base %mine
合并：
C:\Program Files (x86)\Meld\Meld.exe %mine %base %theirs --output %merged
(meld一开始在middle pane中显示%base文件内容，meld修改保存middle pane内容后将middle pane内容保存到%merged file。)
或
C:\Program Files (x86)\Meld\Meld.exe %mine %merged %theirs
另见 https://gitlab.com/tortoisegit/tortoisegit/issues/2698#note_37137238