Mercurial > hg

view tests/test-merge5.out @ 1927:397b62d5dd13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add http_proxy= lines to test-bad-pull and test-pull
author Peter van Dijk <peter@dataloss.nl>
date Wed, 22 Feb 2006 16:11:17 +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)