Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge6.out @ 2132:4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 26 Apr 2006 07:31:04 +0200 |
parents | ced2d3620f95 |
children | b2ae81a7df29 |
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 heads' to see heads, 'hg merge' to merge) 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 heads' to see heads, 'hg merge' to merge) bar should remain deleted. f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo