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

merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533.
author Augie Fackler <durin42@gmail.com>
date Wed, 04 Mar 2009 13:06:16 -0600
parents 7f0dd352fb4d
children
line wrap: on
line source

% directory moved and symlinked
adding foo/a
% now addremove should remove old files
adding bar/a
adding foo
removing foo/a