Mercurial > hg

view tests/test-manifest-merging.out @ 10151:c7355a0e1f39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: make git diffline generation more explicit
author Patrick Mezard <pmezard@gmail.com>
date Tue, 29 Dec 2009 16:00:38 +0100
parents a3d73b3e1f8a
children
line wrap: on
line source

% init foo-base
% create alpha in first repo
adding alpha
% clone foo-base to foo-work
updating to branch default
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