Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1860:97f07d311a50

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged tah and crew
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 08 Mar 2006 06:20:32 +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)