Mercurial > hg-stable

view tests/test-merge5.out @ 2672:118b198c9423

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Provide a relevant description for --timeout.
author Will Maier <willmaier@ml1.net>
date Tue, 25 Jul 2006 10:29:43 -0500
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)