Mercurial > hg

view tests/test-merge-symlinks.out @ 7117:ceb8aef03aa7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 36794dbe66a3
children
line wrap: on
line source

3 files updated, 0 files merged, 0 files removed, 0 files unresolved
% merge heads
HG_FILE l
HG_MY_ISLINK 1
HG_OTHER_ISLINK 0
HG_BASE_ISLINK 0
merging l
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% merge working directory
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
HG_FILE l2
HG_MY_ISLINK 1
HG_OTHER_ISLINK 0
HG_BASE_ISLINK 0
merging l2
0 files updated, 1 files merged, 0 files removed, 0 files unresolved