Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4234:fe0c0a317c09

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make the output of test-locate more readable
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 16 Mar 2007 22:48:21 -0300
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