Data loss when using "Tool Resolve" with Beyond Compare 3
Created originally on Bitbucket by Gili
Windows 7, 64-bit TortoiseHg 3.1
- Update from the current revision to a future revision that involves merge conflicts to a binary file (e.g. docx file was modified).
- When the Resolve Conflicts dialog comes up, hit "Tool Resolve"
- In my case, Beyond Compare 3 is the default resolve tool. When I hit "Tool Resolve" the local file is marked as Resolved but no attempt is made to resolve the conflicts. Hence, any changes introduced by the "other" branch are lost.
Expected behavior: if the tool does not know how to resolve conflicts in a file type, the file should not be marked as Resolved. Instead, the user should resolve conflicts by hand or using a different tool.