Mercurial > hg > mercurial-crew-with-dirclash
diff 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 |
line wrap: on
line diff
--- a/tests/test-flags.out +++ b/tests/test-flags.out @@ -5,6 +5,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files (run 'hg update' to get a working copy) +2 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../test2 searching for changes adding changesets