cleanup: remove redundant clearing of mergestate in rebase and shelve...
cleanup: remove redundant clearing of mergestate in rebase and shelve
`repo.commit()` now clears the merge state even if it ends up not
creating a commit because there were no changes to commit.
Differential Revision:
https://phab.mercurial-scm.org/D8197
