view tests/test-merge5.out @ 4376:de612b5f8d59

Make copy --after work for files that have been hg added.
author Brendan Cully <brendan@kublai.com>
date Tue, 24 Apr 2007 18:43:18 -0700
parents fffc8a733bf9
children
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes