Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge6.out @ 932:fdf3b7f3b3b4
The TODO and the FAQ now live on the Wiki
author | mpm@selenic.com |
---|---|
date | Tue, 16 Aug 2005 23:49:53 -0800 |
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