merge: fixes for merge+rename
findcopies: ignore files renamed on both branches
applyupdates: change remove flag to move
recordupdates: record copy actions, including local moves and deletions
changeset: 0:9426b370c206tag: tipuser: My Name <myname@example.com>date: Mon Jan 12 13:46:40 1970 +0000summary: commit-1