I am using Araxis Merge as my merge tool but it is not working for the "merge" option. It is working for the "diff" option though. When clicking the merge option I can see a dialog appear in sourcetree but it disapears too quickly to see what it says. Then it looks like it has done some sort of auto merge but it is nothing like it should be. It used to open the Araxis Merge application. I have not updated Araxis Merge. I have selected the application names in my compare options for "compare" and "merge" inside sourcetree.
