Mercurial > hg

view tests/test-merge5.out @ 2295:9c15f85e61b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix a typo in an error message
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 16 May 2006 11:07:56 +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)