Before this patch, during hg up across topological branches with
dirty working directory we suggested the user to "commit or update
--clean to discard"
I think suggesting --merge is better than --clean (which discard
changes with no backup). We can keep all the three options, but
probably then we will have sacrifice length of message.