I am attempting to use Meld as an external merge tool with the following config:
Merge Tool: Custom
Diff Command: C:\Program Files (x86)\Meld\Meld.exe
Arguments: $LOCAL $BASE $REMOTE --auto-merge --output=$MERGED
When I right-click on a conflicted file and select 'Resolve Conflicts' > 'Open External Merge Tool' I get the dialog for 'Visual Merge in Process' but the merge tool does not open.
The path is correct.
I am using Sourcetree for Windows, v220.127.116.11. System Git v2.17.1.
Does anyone have any ideas why it is not opening Meld?
We don't formally test with Meld but trying it out now for diff and merge it seems to be working for me.
Its worth checking what
returns, I get
mergetool.sourcetree.cmd='C:/Program Files (x86)/Meld/meld/meld.exe' $LOCAL $BASE $REMOTE --auto-merge --output=$MERGED
difftool.sourcetree.cmd='C:/Program Files (x86)/Meld/meld/meld.exe' $LOCAL $REMOTE
Also check you are not trying it on a file that is deleted as part of the merge, that is a known issue for all external merges
Also check the file names do not have spaces in them, you can work around this by using arguments like
\"$LOCAL\" \"$BASE\" \"$REMOTE\" --auto-merge --output=\"$MERGED\"
In case anybody else is having problems getting their external diff tools to open (I'm using Meld with Mercurial), there appears as if there my be a problem parsing the command variables atm.
If "external diff" isn't working for you, you can try removing the arguments entirely
($LOCAL, $REMOTE, etc), and see if it will at least open. The files might not be ordered the way you like them to be, but if it launches the external diffs in the meantime, it's better than nothing... Hopefully it'll get patched soon.
A vulnerability has been published today in regards to Sourcetree for Windows. The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events