Mercurial > hg

view tests/test-merge-symlinks.out @ 5763:e20de0caf8e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Show number of changesets written to bundle files by default (issue569) This was only shown with -v before.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 30 Dec 2007 19:46:13 +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