Mercurial > hg > gitweb
comparison tests/test-flags @ 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 |
comparison
equal
deleted
inserted
replaced
| 3868:6033d9f28052 | 3869:ad6f34c83c3d |
|---|