Yes. I use SourceTree as well, and find it very co...

# random

[okkero]

Yes. I use SourceTree as well, and find it very convenient. But I don't think it comes with an integrated merge tool. It opens an external diff tool whenever a merge conflict requires solving