[PATCH] merge: report file/directory collisions properly

[Patrick Mézard]

Patrick Mezard a écrit :
> # HG changeset patch
> # User Patrick Mezard <pmezard at gmail.com>
> # Date 1187116733 -7200
> # Node ID 124f1f04a7fba43479e619f620fb5b520114604a
> # Parent  f0f22f1776bf2994d91a7b6f42c7109160aa6587
> merge: report file/directory collisions properly

Without this patch, the update fails for reasons like:
- macosx: abort: Is a directory: /tmp/foo/a
- windows: Access is denied: /tmp/foo/a

test-casefolding will follow, using handmade bundles.