Mercurial > hg > gitweb
view tests/test-hup.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 | c0b449154a90 |
children | a413f5c29c46 |
line wrap: on
line source
0 0 adding changesets killed! transaction abort! rollback completed .hg: 00changelog.i journal.dirstate requires store .hg/store: 00changelog.i