rebase/conflict resolution failure with 4.6.0 on win10
Created originally on Bitbucket by Anonymous
4.6.0 tortoisehg on win10 has a regression w.r.t. conflict resolution when the rebase extension needs it. If a conflict resolution ends with (effectively) 'use this whole file' on 'mine' then the 'unchanged' query popup fails to render and the query text instead appears in the Command output window of the Resolve Conflicts display. The query is defaulted to n and the rebase is effectively unable to proceed from that point and must be exited.
output file ./main.c appears unchanged was merge successful (yn)?$$ &Yes $$ &No n merging ./main.c failed!
Conflict resolutions that result in a change proceed as expected. Note also that there was a NUL in the midst of the text above, which did not survive the cut-n-paste.
The defaulted merge tool selection was tortoisemerge.