Mercurial > hg-stable
diff contrib/debugcmdserver.py @ 44668:e7af56a0733e
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
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 01 Apr 2020 14:34:21 -0700 |
| parents | 2372284d9457 |
| children | c102b704edb5 |