Mercurial > hg
diff tests/test-dirstate.t @ 43370:7f56b0cbd245 stable
py3: render message about conflicts in chistedit code
Now you can also reorder commits that (potentially) conflict. Just
don't try to confirm the changes yet (because then it crashes).
Differential Revision: https://phab.mercurial-scm.org/D7183
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 31 Oct 2019 15:02:03 -0700 |
| parents | 87a34c767384 |
| children | b7808443ed6a |