Mercurial > hg
view tests/test-manifest-merging.out @ 3408:4e0c08f019b8
merge with main
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 16 Oct 2006 09:23:26 +0200 |
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