Mercurial > hg

view tests/test-merge-symlinks.out @ 5972:d83020d0466f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added an entry about the prefix option inside the hgrc man page
author Michele Cella <michele.cella@gmail.com>
date Tue, 22 Jan 2008 23:07:23 +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