Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-pull.out @ 2178:00205fe76993

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 02 May 2006 14:38:32 -0700
parents b2ae81a7df29
children 4e35843b2683
line wrap: on
line diff
--- a/tests/test-pull.out
+++ b/tests/test-pull.out
@@ -9,11 +9,13 @@ adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 foo
 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
 pulling from http://localhost:20059/