merge: handle no file parent in backwards merge (
issue2364)
ui.paths: expand paths directly in fixconfig (
issue2373)
var and home expansion should be done first.
setup/hg: always load Mercurial from where it was installed.
This provides two new features:
- Mercurial may be installed into a non-standard location without
having to set PYTHONPATH.
- Multiple installations can use Mercurial from different locations.