view tests/test-manifest-merging.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 be8efb6e1cc6
children 0750f11152fe
line wrap: on
line source

% init foo-base
% create alpha in first repo
adding alpha
% clone foo-base to foo-work
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% create beta in second repo
adding beta
% create gamma in first repo
adding gamma
% pull into work and merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% revert to changeset 1 to simulate a failed merge
2 files updated, 0 files merged, 0 files removed, 0 files unresolved