tests/test-revlog-raw.py.out

merge: check for path conflicts when merging (issue5628)

When merging, check for any path conflicts introduced by the manifest
merge and rename the conflicting file to a safe name.

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

local test passed
addgroupcopy test passed
clone test passed
lowlevelcopy test passed