comparison mercurial/streamclone.py @ 32313:a580b2d65ded

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.
author Jeremy Fitzhardinge <jsgf@fb.com>
date Thu, 18 May 2017 13:18:05 -0700
parents 076f1ff43f0f
children 33b7283a3828
comparison
equal deleted inserted replaced
32312:0d6b3572ad92 32313:a580b2d65ded