HomePhabricator

simplemerge: don't calculate conflict labels when resolving automatically

Authored by martinvonz.