Reset ancestry (additional parents) when resetting the active branch

[j4yk]

There are two reset commands in the commit list menu, but neither of them changes the state of the working copy. Thus, the additonal parents added during an attempted (and then aborted) merge are not removed.

There should be no more additional parents after the active branch has been reset to an existing version.

[j4yk]

What is odd about this is that the reset action is currently not a "--hard" reset; it does not affect what is loaded in the image. So it would be quite invisible that it does reset the ancestry. Also you will not see it until after the next commit because the commit dialog does not show the parent commits.