If you're merging with 'update -m' and you get a conflict between a file and a
directory, you get one of two unhelpful responses:
$ hg update -m
abort: Is a directory

$ hg update -m
abort: File exists: /home/jeremy/hg/t/1/foo