Page MenuHomePhabricator

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

Authored by martinvonz on Jan 24 2020, 7:16 PM.

Details

Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jan 24 2020, 7:16 PM
pulkit accepted this revision.Jan 24 2020, 8:24 PM
This revision is now accepted and ready to land.Jan 24 2020, 8:24 PM