diff 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
line wrap: on
line diff
--- a/tests/test-up-local-change.out
+++ b/tests/test-up-local-change.out
@@ -133,4 +133,4 @@ adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
-0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved