comparison tests/test-up-local-change.out @ 3408:4e0c08f019b8

merge with main
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 16 Oct 2006 09:23:26 +0200
parents d2b55e3c4e25
children 41989e55fa37
comparison
equal deleted inserted replaced
3407:03e7e8958a27 3408:4e0c08f019b8
131 requesting all changes 131 requesting all changes
132 adding changesets 132 adding changesets
133 adding manifests 133 adding manifests
134 adding file changes 134 adding file changes
135 added 1 changesets with 1 changes to 1 files 135 added 1 changesets with 1 changes to 1 files
136 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 136 1 files updated, 0 files merged, 0 files removed, 0 files unresolved