Mercurial > hg > pyhgsh

view tests/test-merge5.out @ 2052:c0b945c5df08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added tag 0.8.1 for changeset 6a03cff2b0f5d30281e6addefe96b993582f2eac
author Matt Mackall <mpm@selenic.com>
date Fri, 07 Apr 2006 20:08:11 -0500
parents 5c4496ed152d
children b2ae81a7df29
line wrap: on
line source

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)