Mercurial > hg > mercurial-crew

view tests/test-merge-symlinks.out @ 9731:0e080d519d1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: treat rev as raw-rev if user agent is hg
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 06 Nov 2009 22:46:46 +0100
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