rebase: don't create merge when continuing rebase interrupted by old hg...
rebase: don't create merge when continuing rebase interrupted by old hg
This fixes the bug described and demonstrated in the previous
commit. It does so by practically undoing
8082a77cc3a2 (rebase: remove
some redundant setting of dirstate parents, 2020-01-10).
Differential Revision:
https://phab.mercurial-scm.org/D8356