tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 12 Jan 2006 21:55:19 +0100
changeset 1621 ee16f06174bd
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Restored old behaviour for 'hg co' and 'hg co -C' for removed files.

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)