Page MenuHomePhabricator

merge: make manifestmerge() override more flexible
ClosedPublic

Authored by martinvonz on Jan 19 2018, 11:32 AM.

Details

Summary

The function has had an optional forcefulldiff argument for a long
time, but it's only passed by bidmerge, so it very rarely happens.

Diff Detail

Repository
rNRWHG narrowhg
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 19 2018, 11:32 AM
durin42 accepted this revision.Jan 19 2018, 1:20 PM
This revision is now accepted and ready to land.Jan 19 2018, 1:20 PM
This revision was automatically updated to reflect the committed changes.