Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 2520:e30f425a4b2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make changeset outputted by the raw template to be closer to 'hg export'
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 30 Jun 2006 10:16:38 +0200
parents b2ae81a7df29
children 49988d9f0758
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)