Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4261:1eaa8d90c689

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix util.copyfile to deal with symlinks
author Eric St-Jean <esj@wwd.ca>
date Wed, 21 Mar 2007 23:20:56 -0400
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