view tests/test-merge8.out @ 5032:6dbd40b6307c

Update expected test output It's no longer a "problem" to have the same name listed with no prefix and a "hgext." prefix.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 30 Jul 2007 20:48:50 -0700
parents bb1800a7d7e1
children 0750f11152fe
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved