Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 2083:345107e167a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge 0.8.1 with revlogng
author Chris Mason <mason@suse.com>
date Sat, 08 Apr 2006 20:10:46 -0400
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)