tests/test-merge5.out
author Robin Farine <robin.farine@terminus.org>
Tue, 08 Nov 2005 10:35:05 -0800
changeset 1512 53ad6ee6ede4
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
generalize copy/rename to handle more than one source directory

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)