Page MenuHomePhabricator

merge: call hg.abortmerge() directly and return early
ClosedPublic

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

Details

Summary

It's seem really weird to go through a lot of unrelated code before we
call hg.merge(..., abort=True) when we can just call
hg.abortmerge() and return early.

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:23 PM
This revision is now accepted and ready to land.Jan 24 2020, 8:23 PM
This revision was automatically updated to reflect the committed changes.