External merge tool does not start when trying to resolve conflicts

Rudy Vigneault

I have a file for which I had stashed changes. I pulled changes from the repository and when applying the stashed changes there were conflicts.

Only the content of the file changed (the name is the same and the file was not removed nor moved).

When I right click on the file and select "Resolve Conflicts">"Launch External Merge Tool" the "Visual Merge In Progress" window appears but the application does not start.

If I click on "Abort", I see that the *_BACKUP_*, *_BASE_*, *_LOCAL_* and *_REMOTE_* files were created.

Launching the tool works for diff but not for merge. This is quite new since it used to work.

I am using SourceTree v2.1.2.5 and I my external Merge Tool is configured to be Araxis Merge.

Rudy Vigneault

One thing that I noticed: I cannot diff the file using the external tool while it is flagged as conflicting (i.e. the icon is /!\ ) as the tool won't start but I can diff using the external tool it when I pass it to resolved (i.e. a normal "modified" file - [...] icon).