Sourcetree - Currently working custom merge options for WinMerge

 

Currently working custom merge options for WinMerge:

The options I used in Sourcetree 3.4.3 for Windows 64-bit with WinMerge 2.16.10.0 x64 and which worked for merging:

• Options > Diff > External Diff / Merge:
  • Merge Tool: Custom
  • Merge Command: C:\Program Files\WinMerge\WinMergeU.exe
    • Arguments:

      -wl -wr -dl Remote -dm Base -dr Local \"$REMOTE\" \"$BASE\" \"$LOCAL\" -o \"$MERGED\"

 

 

ref : https://jira.atlassian.com/browse/SRCTREEWIN-13514