Mercurial > hg
view tests/test-bad-pull.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 | 5eb02f9ed804 |
children | 490e40816cbd |
line wrap: on
line source
abort: error: Connection refused 255 copy: No such file or directory abort: HTTP Error 404 0