HomePhabricator

merge: check that there are no conflicts after --abort

Authored by martinvonz.

Description

merge: check that there are no conflicts after --abort

Same idea as in abcc82bf0717 (clean: check that there are no conflicts
after, 2020-01-24). We should reuse more code here, but that will come
later.

Differential Revision: https://phab.mercurial-scm.org/D7994

Details