Cannot abort external conflict merges - file is always marked as resolved Edited

I'm using SourceTree for Windows v2.1.2.3.

I'm unable to abort merges launched in an external merge tool - even after I've clicked abort in the modal dialogue opened by SourceTree, when I close the external merge tool (without saving the tmp file), SourceTree marks the conflicted file as resolved.

I'm using WinMerge as a custom merge tool, with the command "C:\Program Files (x86)\WinMerge\WinMergeU.exe" and argument "$MERGED" to make use of WinMerge's conflict file merge facility.

 

0 comments

Comment

Log in or Sign up to comment
Community showcase
Posted an hour ago in Featured Groups

Want to know how Atlassians monitor their enterprise deployments?

At Atlassian, we believe in our own products – that's why we use them, even at the enterprise level. Doing so gives us first-hand experience of how they perform at scale; to do this, we monitor each ...

10 views 0 0
View post

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you