merge: better error messages to lead users to hg update --clean to abandon merges.
Fixes issue1533.
abort: repository a not found!255abort: error: Connection refused255abort: repository a not found!255abort: destination '../a' already exists255abort: repository a not found!255destination directory: qabort: destination 'q' already exists