Mercurial > hg-stable

view tests/test-manifest-merging.out @ 6057:218d5b9aa466

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove trailing ! from two error messages as this was confusing.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 09 Feb 2008 19:13:57 +0100
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