Mercurial > hg
view tests/test-parseindex.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 | 6563438219e3 |
children | 4c94b6d0fb1c |
line wrap: on
line source
changeset: 0:9c2cf2b35aa7 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: add foo changeset: 1:3756a9556b89 tag: tip user: test date: Mon Jan 12 13:46:41 1970 +0000 summary: change foo 2 revisions: 9c2cf2b35aa7 3756a9556b89