I'm solving conflicts on files with Diffmerge (v. 4.2.0), when the file is saved and the control returns to Sourcetree it crashes.
I'm using Sourcetree (v. 1.8.1.0), no information is written in sourcetree.log