comparison tests/test-flags.out @ 2178:00205fe76993

merge with crew.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 02 May 2006 14:38:32 -0700
parents b2ae81a7df29
children 455109df3669 966632304dde
comparison
equal deleted inserted replaced
2177:6886bc0b77af 2178:00205fe76993
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 2 changes to 2 files 6 added 1 changesets with 2 changes to 2 files
7 (run 'hg update' to get a working copy) 7 (run 'hg update' to get a working copy)
8 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
8 pulling from ../test2 9 pulling from ../test2
9 searching for changes 10 searching for changes
10 adding changesets 11 adding changesets
11 adding manifests 12 adding manifests
12 adding file changes 13 adding file changes