comparison tests/test-clone.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 d7304434390f
children b4c82b704180
comparison
equal deleted inserted replaced
43369:8aa54c5a2577 43370:7f56b0cbd245