Mercurial > hg
view tests/test-manifest-merging.out @ 5746:d3ef7e86bc3b
patchbomb: break lines > 80 chars (coding style)
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Tue, 18 Dec 2007 22:50:27 +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