Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge6.out @ 1010:f46e809bbe87
Merge with TAH
author | mpm@selenic.com |
---|---|
date | Tue, 23 Aug 2005 14:21:19 -0700 |
parents | 6f274afc05c7 |
children | 9344f5dd4488 |
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. 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 (run 'hg update' to get a working copy) bar should remain deleted. f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo