Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1743:813f9f5fe837

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with upstream
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 18 Feb 2006 06:50:22 +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)