![]() Merge Command: C:\Program Files\WinMerge\WinMergeU.Options > Diff > External Diff / Merge:.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. Neither SourceTree staging nor issuing git add. Then I changed my mind and deleted entries for p4Merge from my /.gitconfig file since I noticed I ended up having double entries for merge and diff tools there. Some versions of SourceTree broke the built-in Beyond Compare integration. Integrate P4Merge to SourceTree: SourceTree - Preference - Diff Menu - In 'External Diff / Merge' - 'Visual Diff Tool' select 'P4Merge' and in 'Merge Tool' select 'P4Merge' as below picture: 3. 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): I added p4Merge as merge tool and diff tool in my git config. P4MERGEC:Program FilesBeyond Compare 4BCompP4Merge.bat.
0 Comments
Leave a Reply. |