comparison tests/test-up-local-change.out @ 3002:a31557193f3c

merge: simplify working dir manifest generation
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 17:08:38 -0500
parents fb493241d7f6
children 87a0332ab58b
comparison
equal deleted inserted replaced
3001:ad558f297eb1 3002:a31557193f3c
135 requesting all changes 135 requesting all changes
136 adding changesets 136 adding changesets
137 adding manifests 137 adding manifests
138 adding file changes 138 adding file changes
139 added 1 changesets with 1 changes to 1 files 139 added 1 changesets with 1 changes to 1 files
140 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 140 merging a
141 0 files updated, 1 files merged, 0 files removed, 0 files unresolved