Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge2.out @ 1169:e388c4f5cec5
Reverted changeset e254bcbfe636e97301f76c7da241b07be14f3d36
Volker Kleinfeld agreed that this is dead code and tried to fix a problem
which was already fixed somewhere else.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Tue, 30 Aug 2005 21:26:27 +0200 |
| parents | 5a034646e472 |
| children | b2ae81a7df29 |