Hello! I'm unable to solve a conflict on a binary file because when i choose "Resolve using theirs/mine" Sourcetree launches external diff tool (DiffMerge in my case) which says that it "Cannot Import File into Unicode!"
What should I do? Is it something in my settings or is it a bug??