Mercurial > hg > gitweb

view tests/test-merge5.out @ 2105:21cf3fe64e27

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with cmason
author Matt Mackall <mpm@selenic.com>
date Thu, 20 Apr 2006 12:12:03 -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)