merge: better error messages to lead users to hg update --clean to abandon merges.
Fixes issue1533.
To run the tests, do:cd tests/python run-tests.pySee http://www.selenic.com/mercurial/wiki/index.cgi/WritingTests formore information on writing tests.