Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 5311:5b6e403601d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bisect: do silent init if necessary
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sat, 22 Sep 2007 18:23:56 +0200
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