Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 2031:d242719c716e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Web site and wiki are now the same.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 01 Apr 2006 19:11:59 +0200
parents ced2d3620f95
children 5c4496ed152d
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 '-C' to lose changes)