d3vid d3vid -3 years ago 311
Git Question

How do I configure TortoiseGit to use Meld for diff, merge and conflicts?

I have tried a naive configuration to replace the native TortoiseGit viewers with Meld for Windows for diff, merge and conflict actions. What additional parameters do I need to pass in to Meld for these functions?

Simplest configuration: path to Meld.exe

Answer Source

Tested under meld 3.16.2

Diff:

C:\Program Files (x86)\Meld\Meld.exe %base %mine

Merge:

C:\Program Files (x86)\Meld\Meld.exe %mine %base %theirs --output %merged

enter image description here

(meld shows the %base file content in middle pane at the beginning. And meld saves the content of middle pane to %merged file after modifying and saving the content of middle pane.)

or

C:\Program Files (x86)\Meld\Meld.exe %mine %merged %theirs

enter image description here

Also see https://gitlab.com/tortoisegit/tortoisegit/issues/2698#note_37137238

Recommended from our users: Dynamic Network Monitoring from WhatsUp Gold from IPSwitch. Free Download