Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 2128:150208e0d94b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 25 Apr 2006 19:38:45 +0200
parents 5c4496ed152d
children b2ae81a7df29
line wrap: on
line source

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