Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-manifest-merging.out @ 4731:1d5a2ee683b0
Fix tgz archival on Windows.
Making tgz's on Windows has been broken by 06de65673ec2
due to not being careful enough about binary mode opens.
author | csaba.henk@creo.hu |
---|---|
date | Wed, 27 Jun 2007 08:35:26 -0700 |
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