Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-unrelated-pull.out @ 793:445970ccf57a
Merge with upstream
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 06:43:21 +0100 |
parents | ffeb2c3a1966 853bfbf1a312 |
children | 1f9ec150a476 |
line wrap: on
line diff
--- a/tests/test-unrelated-pull.out +++ b/tests/test-unrelated-pull.out @@ -3,16 +3,16 @@ searching for changes warning: pulling from an unrelated repository! adding changesets adding manifests -adding file revisions -modified 1 files, added 1 changesets and 1 new revisions +adding file changes +added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) -changeset: 1:9a79c33a9db37480e40fbd2a65d62ebd2a3c441c +changeset: 1:9a79c33a9db3 tag: tip user: a date: Thu Jan 1 00:00:00 1970 summary: a -changeset: 0:01f8062b2de51c0fa6428c5db1d1b3ea780189df +changeset: 0:01f8062b2de5 user: b date: Thu Jan 1 00:00:00 1970 summary: b