I am running OS X.10
, Xcode 7
and SourceTree 2
.
When I select a conflicted file and Launch an external merge tool
, there is a window that appears very briefly... and then nothing happens.
I tried (see this help page) sudo ln -s /Developer/usr/bin/opendiff /usr/bin/opendiff
but it did not work (I got the message ln: /usr/bin/opendiff: File exists
).
What should I do?
PS:
Here is a picture of the window that briefly appears.
PPS:
Here are the SourceTree preferences:
2015-11-04 17:11:32.360 opendiff[10848:132187] too few arguments 2015-11-04 17:11:32.365 opendiff[10848:132187] usage: opendiff file1 file2 [-ancestor ancestorFile] [-merge mergeFile]
– Colas Nov 4 '15 at 22:11