Mercurial > hg
view tests/test-manifest-merging.out @ 7117:ceb8aef03aa7
Document email.charsets in hgrc.5
hgrc.5.ja.txt probably should include an example like:
[email]
charsets = iso-8859-1, iso-8859-15, windows-1252, iso-8859-2,
windows-1250, iso-2022-jp, iso-2022-jp-ms
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Thu, 16 Oct 2008 17:08:46 +0200 |
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