tests/test-revlog-raw.py.out

simplemerge: set `conflicts` earlier for :union tool

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

local test passed
addgroupcopy test passed
clone test passed
lowlevelcopy test passed
slicing test passed
issnapshot test passed
findsnapshot test passed