Mercurial > hg

view tests/test-manifest-merging.out @ 5679:1d8ef9fb3e88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Atom/RSS logo display problem using min font size. Using Minimum Font Size = 18 on Firefox, the Atom and RSS logos in a changeset web page look crushed together. No need to specify an absolute width for text; just use sensible padding instead.
author Jesse Glick <jesse.glick@sun.com>
date Thu, 20 Dec 2007 07:05:40 -0500
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