Mercurial > hg
view tests/test-manifest-merging.out @ 9566:449e85edc8f1
i18n-pt_BR: synchronized with a1ee850f49e3
author | Wagner Bruna <wbruna@softwareexpress.com.br> |
---|---|
date | Mon, 28 Sep 2009 20:14:39 -0300 |
parents | 0750f11152fe |
children | a3d73b3e1f8a |
line wrap: on
line source
% init foo-base % create alpha in first repo adding alpha % clone foo-base to foo-work updating working directory 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