rebase: make sure merge state is cleaned up for no-op rebases (issue5494)
If a rebase ends up doing a no-op commit, make sure the merge state is still cleaned up.
from __future__ import absolute_importimport pkgutil__path__ = pkgutil.extend_path(__path__, __name__)