Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 19:08:04 -0500] rev 3257
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