Merge conflict dialog unclear
Created originally on Bitbucket by Anonymous
The new merge conflict dialog as of 2.0 is totally unclear. I don't understand what auto resolve means and when I click manual resolve the diff viewer doesn't show. The viewer only seems to show when I select all files and click "Manual resolve" on all of them.
The entire dialog is very confusing.