HomePhabricator

simplemerge: add a specialized function for "union", "local", "other"

Authored by martinvonz.