tests/test-merge5.out
author Robin Farine <robin.farine@terminus.org>
Tue, 24 Jan 2006 13:59:01 +1300
changeset 1634 f49f602fae92
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
copy & rename can ignore removed source files As mercurial now distinguishes deleted files from removed files, we can skip removed source files while copying or renaming.

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)