Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1925:c71420b186b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small solaris portability fixes from John Levon <levon@movementarian.org>
author Peter van Dijk <peter@dataloss.nl>
date Wed, 22 Feb 2006 15:42:48 +0100
parents 5a034646e472
children ced2d3620f95
line wrap: on
line source

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)