This is an archive of the discontinued Mercurial Phabricator instance.

morestatus: check whether the conflict message is None before printing
ClosedPublic

Authored by pulkit on Aug 21 2017, 7:14 AM.

Details

Summary

There are cases like bisect when the conflict message can be None. So we make
sure that we don't print None in that case.

Thanks to Martin for catching this.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Aug 21 2017, 7:14 AM
dsp accepted this revision.Aug 21 2017, 11:17 AM
durin42 accepted this revision.Aug 23 2017, 11:49 AM
This revision is now accepted and ready to land.Aug 23 2017, 11:49 AM
This revision was automatically updated to reflect the committed changes.