This is an archive of the discontinued Mercurial Phabricator instance.

status: advertise --abort instead of 'update -C .' to abort a merge
ClosedPublic

Authored by pulkit on Aug 9 2018, 6:18 AM.

Details

Summary

status has a part where it shows the conflict information and how to continue or
abort. Couple of release ago, we got merge --abort and we should advertise that
instead of 'hg update -C .' which is kind of ugly.

I know we need to unify the logic here.

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.