3-way diff crash when manually resolving merge conflicts
Created originally on Bitbucket by matteosistisette (matteo sisti sette)
I was doing a merge and there were conflicts to be resolved.
I chose "tool resolve". This automatically opened the 3-way diff tool (I think this behavior has changed: before it would show you the list of automatically resolved files and you would have to manually select each of them and click on "3-way diff"), for one file at a time one after the other.
After editing a few files, (each time, by closing the 3-way diff window, a new one would pop up with the following file with conflicts), at the N-th one, something crashed. See the attachment.
This is very critical: you definitely don't want stuff to crash just when you are manually resolving merge conflicts.
Attachments: Screenshot_from_2016-12-12_18-48-30