Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-manifest-merging.out @ 5474:5d8f5ad45c12
Added signature for changeset 23889160905a1b09fffe1c07378e9fc1827606eb
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 19 Oct 2007 18:25:28 -0500 |
parents | be8efb6e1cc6 |
children |
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