TortoiseHG commits unchecked chunks between the merge wizard finishing and committing by hand
Created originally on Bitbucket by gmb1226 (Greg Besack)
Today while merging, I found a line of code I wanted to back out of the merge commit that wasn't available to change as part of the conflict resolution window. It was a bit of debug code left in. So after the merge wizard finished, I did a “Commit Later” so I could change it before the merge.
I clicked on the offending source file, and unchecked the code chunk. Then I clicked commit to finalize the merge.
When I viewed the resulting merge, this chunk was still included in the merge, even though I unchecked it.
I expected the chunk to be excluded from the merge commit and left in the stating area.