Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge7 @ 3257:c93ce7f10f85
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
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 04 Oct 2006 19:08:04 -0500 |
| parents | e506c14382fd |
| children | c0b449154a90 |
comparison
equal
deleted
inserted
replaced
| 3256:7c114915fbdb | 3257:c93ce7f10f85 |
|---|