view tests/test-issue322.out @ 7821:9fe7e6acf525

merge: better error messages to lead users to hg update --clean to abandon merges.

Fixes issue1533.

% file replaced with directory
adding a
% should fail - would corrupt dirstate
abort: file 'a' in dirstate clashes with 'a/a'
% directory replaced with file
adding a/a
% should fail - would corrupt dirstate
abort: directory 'a' already in dirstate
% directory replaced with file
adding b/c/d
% should fail - would corrupt dirstate
abort: directory 'b' already in dirstate