HomePhabricator

merge: make manifestmerge() override more flexible

Authored by martinvonz.

Description

merge: make manifestmerge() override more flexible

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

Differential Revision: https://phab.mercurial-scm.org/D1916

Details