Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-simple-update.out @ 793:445970ccf57a
Merge with upstream
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 06:43:21 +0100 |
parents | 61ed30e82b27 122449dd89db |
children | 1f9ec150a476 |
comparison
equal
deleted
inserted
replaced
792:49ec802b4a16 | 793:445970ccf57a |
---|---|
20 + hg pull ../branch | 20 + hg pull ../branch |
21 pulling from ../branch | 21 pulling from ../branch |
22 searching for changes | 22 searching for changes |
23 adding changesets | 23 adding changesets |
24 adding manifests | 24 adding manifests |
25 adding file revisions | 25 adding file changes |
26 modified 1 files, added 1 changesets and 1 new revisions | 26 added 1 changesets with 1 changes to 1 files |
27 (run 'hg update' to get a working copy) | 27 (run 'hg update' to get a working copy) |
28 + hg verify | 28 + hg verify |
29 checking changesets | 29 checking changesets |
30 checking manifests | 30 checking manifests |
31 crosschecking files in changesets and manifests | 31 crosschecking files in changesets and manifests |