You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
So I have the external merging tool setup, with the path and everything, but when I click "Launch External Merge Tool" from the dropdown, the merge tool is never launches
This is what my .gitconfig looks like
cmd = 'C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe' \"$LOCAL\" \"$REMOTE\"
cmd = 'C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe' -merge -result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
trustExitCode = true
And my Tools/Diff window in sourcetree:Can anybody give me a hand? Thanks!
Hi @Gizambica ,
Welcome to the Community!
I'm not 100% familiar with DiffMerge itself, but looking at their command line argument documentation: https://sourcegear.com/diffmerge/webhelp/sec__clargs__merge.html
It looks as though the arguments you are supplying might be attempting to perform the merge automatically and then exiting. Have you tried setting the merge command without supplying any arguments to see if it will launch?
I hope that helps!