HomePhabricator

simplemerge: set `conflicts` earlier for :union tool

Authored by martinvonz.