The options I used in Sourcetree 3.4.3 for Windows 64-bit with WinMerge 2.16.10.0 圆4 and which worked for merging: Currently working custom merge options for WinMerge: I tried today () using WinMerge 3-way merge with the custom merge option using the information from this Sourcetree Community question and it worked okay. But as of WinMerge has supported 3-way merge (See WinMerge 2.15.2 changelog from : 'Add support for 3-way compare/merge'). The bug SRCTREEWIN-4572 ('Can't select WinMerge as merge tool') from 2016 was closed because WinMerge didn't yet support a 3-way merge. WinMerge is available in the 'Options > Diff > External Diff / Merge > Merge Tool' dropdown box and merging using it works.īackground / related issues: Related bug: WinMerge is not available in the 'Options > Diff > External Diff / Merge > Merge Tool' dropdown box.

Please could you add WinMerge to the merge tool selection as it has supported 3-way merge since early 2018? Thank you! Current situation (Tested on Sourcetree 3.4.3 Windows 64-bit):

Winmerge git difftool