Mercurial > hg

view tests/test-merge5.out @ 3046:2a4d4aecb2b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with Brendan Cully
author Josef "Jeff" Sipek <jeff@josefsipek.net>
date Sat, 19 Aug 2006 15:20:54 -0400
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)