Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge6.out @ 978:ea67e5b37043
hgweb: Changed file revision page to list format syntax
author | Josef "Jeff" Sipek <jeffpc@optonline.net> |
---|---|
date | Wed, 17 Aug 2005 22:08:15 -0500 |
parents | 5a034646e472 |
children | 5007e0bdeed2 |
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 (run 'hg update' to get a working copy) bar should remain deleted. 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo pulling from ../A2 searching for changes adding changesets adding manifests adding file changes added 1 changesets with 0 changes to 0 files (run 'hg update' to get a working copy) bar should remain deleted. 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo