Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-abort-checkin.out @ 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 | 6bd351194a96 |
children | 193e0f8d9a47 |
line wrap: on
line source
abort: edit failed: false exited with status 1 transaction abort! rollback completed abort: edit failed: false exited with status 1 transaction abort! rollback completed