Mercurial > hg > mercurial-crew
view tests/test-manifest-merging.out @ 9905:95517eb3c9a7
run-tests: work around a distutils bug triggered by 0a8a43b4ca75
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 22 Nov 2009 19:11:12 +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