Tool Resolve Fails On Saving Merged File From DiffMerge
Created originally on Bitbucket by Anonymous
Merging a branch and utilizing tool resolve to merge conflicts that could not automatically be resolved fails on save. Steps to Reproduce:
- Merge branch with conflicting changes to local branch.
- Use Mercurial Resolve to automatically merge any conflicts.
- Select Tool Resolve for conflicts that could not be automatically merged.
- Use DiffMerge to manually merge file
- Save merged file
- Exit DiffMerge and receive error
"Traceback (most recent call last): File "tortoisehg\hgqt\thread.pyo", line 222, in interact_handler TypeError: 'int' object is not iterable"
Attachments: bugreport.txt