merging directories and files is unhelpful
This issue was imported from Bugzilla (issue29). # Original description `````````````````````````` 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 `````````````````````````` # Relevant original bug metadata | Field | Value | | --- | --- | | Bug ID | 29 | | Created on | 2005-10-24T17:59:18Z | | Component | Mercurial | | Reporter | jeremy (Jeremy Fitzhardinge) | | Status | RESOLVED | | Resolution | ARCHIVED | | Operating System | All | | Priority | normal | | Severity | feature | | Mercurial version | unspecified | | Python version | None |
issue