SourceTree cannot resolve conflcts
<p>I right clicked on a file with conflicts and right clicked a file with conflicts in SourceTree 2.0.5.2. I selected "Resolve Conflicts > Launch External Merge Tool" but then nothing happened.</p>

<p>So I tried restarting SourceTree but now the option is grayed out.</p>

<p>I tried changing the merge tool to P4Merge, but the option is still grayed out.</p>

<p>How do I fix this so I can use the merge tool to resolve this conflict using SourceTree?</p>

<p>I'm running this under Mac OS 10.11.2.</p>