Mercurial > hg
view tests/test-lock-badness.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 | b2ae81a7df29 |
children | 0750f11152fe |
line wrap: on
line source
adding a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b pushing to ../a abort: could not lock repository ../a: Permission denied