Mercurial > hg

view tests/test-merge-symlinks.out @ 9391:2705e6816d33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use 'x in dict' instead of 'dict.has_key(x)' "in" is faster, and has_key will be removed in py3k
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Mon, 24 Aug 2009 21:00:34 +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