Mercurial > hg

view tests/test-merge5.out @ 1923:7d83a351a936

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix testsuite for freebsd and one timingissue
author Peter van Dijk <peter@dataloss.nl>
date Tue, 21 Feb 2006 22:23:51 +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)