Mercurial > hg
comparison tests/test-conflict.t @ 41342:fe83040400b7
uncommit: set dirstateparents from within _fixdirstate()
It's now done in the same way for uncommit and unamend, so we can
share the code.
Differential Revision: https://phab.mercurial-scm.org/D5662
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Sun, 20 Jan 2019 21:49:58 -0800 |
| parents | fd805a44b89d |
| children | 7315464f0613 |
comparison
equal
deleted
inserted
replaced
| 41341:19c590ce8661 | 41342:fe83040400b7 |
|---|