Revert changeset
c67920d78248.
It breaks 'hg merge && hg up -c REV' when files exist only in one of the
manifests, making hg throw a traceback like:
fix bash completion of debug commands; add test for debugcomplete
The debugconfig -> showconfig renaming broke things.
merge: pull user messages out to hg.py
- add _update for shadowing in clone
- add _showstats helper
- remove update parameter defaults
- move stats message and merge help messages