Mercurial > hg

view tests/test-manifest-merging.out @ 6101:abb1c451a88e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Define tla username locally in baz and tla tests Suggested by Alexis S. L. Carvalho.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 13 Feb 2008 00:40:18 +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