"Resolve Conflicts" dialog - no way to perform manual merge anymore
Created originally on Bitbucket by gorbunovav (Andrey Gorbunov)
There was option in the list of diff tools, which was allowing to open merge window even in case "Tool resolve" was able to resolve all conflicts in the file, but now it is missing.
I only have 3 options there: default, kdiff3 and docdiff. default/kdiff3 just moves file to the bottom list after resolving conflicts.
Also, I think, that such behavior is/was confusing in general. From my point of view the "Mercurial Resolve" button is responsible for automatic merge and "Tool Resolve" is for manual merge, so it should always open the merge window, despite automatic resolving process outcome.
My environment: TortoiseHG 3.5 on Windows 10 Build 10547 I think I don't have any merge-related third-party extensions installed.
Best regards, Andrey