tests/test-manifest-merging.out
author Brendan Cully <brendan@kublai.com>
Sat, 04 Aug 2007 23:07:52 -0700
changeset 5116 35d47b06d4e3
parent 3326 be8efb6e1cc6
child 6338 0750f11152fe
permissions -rw-r--r--
patch: add git symlink support

% 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