tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 17 Jan 2006 16:00:55 +0100
changeset 1624 d9e576e55d81
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Added test for relative paths and all status flags for 'hg status'

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)