Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge6.out @ 1043:9344f5dd4488
Update tests
author | mpm@selenic.com |
---|---|
date | Wed, 24 Aug 2005 19:19:35 -0700 |
parents | 6f274afc05c7 |
children | ced2d3620f95 |
comparison
equal
deleted
inserted
replaced
1042:23f9d71ab9ae | 1043:9344f5dd4488 |
---|---|
1 pulling from ../B1 | 1 pulling from ../B1 |
2 searching for changes | 2 searching for changes |
3 adding changesets | 3 adding changesets |
4 adding manifests | 4 adding manifests |
5 adding file changes | 5 adding file changes |
6 added 1 changesets with 1 changes to 1 files | 6 added 1 changesets with 1 changes to 1 files (+1 heads) |
7 (run 'hg update' to get a working copy) | 7 (run 'hg update' to get a working copy) |
8 bar should remain deleted. | 8 bar should remain deleted. |
9 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo | 9 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |
10 pulling from ../A2 | 10 pulling from ../A2 |
11 searching for changes | 11 searching for changes |
12 adding changesets | 12 adding changesets |
13 adding manifests | 13 adding manifests |
14 adding file changes | 14 adding file changes |
15 added 1 changesets with 0 changes to 0 files | 15 added 1 changesets with 0 changes to 0 files (+1 heads) |
16 (run 'hg update' to get a working copy) | 16 (run 'hg update' to get a working copy) |
17 bar should remain deleted. | 17 bar should remain deleted. |
18 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo | 18 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |