view tests/test-abort-checkin.out @ 3869:ad6f34c83c3d

Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 11 Dec 2006 18:09:52 +0100
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