Fix push over https.
Without this patch, python gives me a
TypeError: write() argument 1 must be string or read-only buffer, not file
Allow http://user@example.com URLs (i.e. without passwords)
Adjusted test output to changed abort message of 'hg merge' (from
0229ff95faec)