Auto resolve merges breaks merging on conflict with binary file
Created originally on Bitbucket by patches11 (Robert Belcher)
In 2.0.4, when auto resolve merges is turned on, and both of the branches being merged have changed the same binary file, clicking the Merge button in the merge dialog results in the error message (titled "Merge failed") "Returning to first page". Clicking OK takes you back to the merge dialog. Normally, you can go to the resolve dialog and resolve the conflict. However, for some reason, when auto resolve merges is enabled, the working directory status immediately goes back to Clean (you can see it show the resolve link for an instant on a big enough repo, otherwise it shows Clean right away), and no changes are present in the working directory. The only workarounds I have found are turning off auto resolve merges, or performing the merge at the command line.