Mercurial > hg
diff tests/crashgetbundler.py @ 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 | 2372284d9457 |
children | 6000f5b25c9b |