statichttprepo: do not use platform path separator to build a URL
It wouldn't work between Windows client and Unix server.
merge: disable path conflict checking by default (
issue5716)
We shouldn't ship a severe perf regression in hg update for 4.4.
Differential Revision: https://phab.mercurial-scm.org/D1223