Mercurial > hg
comparison mercurial/simplemerge.py @ 33845:3ddbab49efcf
rebase: remove revignored and nullmerge states
They are no longer necessary to make rebase behavior correct. Therefore
remove them to make the code cleaner and easier to reason about.
Differential Revision: https://phab.mercurial-scm.org/D26
| author | Jun Wu <quark@fb.com> |
|---|---|
| date | Mon, 10 Jul 2017 12:18:32 -0700 |
| parents | aa6c290a77fa |
| children | f39ba8237ed6 |
comparison
equal
deleted
inserted
replaced
| 33844:437e317d7913 | 33845:3ddbab49efcf |
|---|