tests/test-merge5.out

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)