Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4008:6e0cb0790e23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: fix strip failing to unlink a bundle os.unlink doesn't know how to deal with urls
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 26 Dec 2006 21:57:20 +0100
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