Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge6.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 | 9344f5dd4488 |
children | ced2d3620f95 |
line wrap: on
line source
pulling from ../B1 searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg update' to get a working copy) bar should remain deleted. f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo pulling from ../A2 searching for changes adding changesets adding manifests adding file changes added 1 changesets with 0 changes to 0 files (+1 heads) (run 'hg update' to get a working copy) bar should remain deleted. f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo