tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 26 Apr 2006 07:31:04 +0200
changeset 2132 4990b62fd0a6
parent 2038 5c4496ed152d
child 2175 b2ae81a7df29
permissions -rw-r--r--
hgweb: Synchronised filelogentry to changelogentry.

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)