This is an archive of the discontinued Mercurial Phabricator instance.

merge: hint about using `hg resolve` for resolving conflicts
ClosedPublic

Authored by martinvonz on Aug 21 2019, 4:20 PM.

Details

Summary

This was suggested by one of our users at Google. Makes sense to me.

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.Aug 21 2019, 4:20 PM
pulkit accepted this revision.Aug 22 2019, 1:21 PM
This revision is now accepted and ready to land.Aug 22 2019, 1:21 PM