Mercurial > hg

view tests/test-merge-symlinks.out @ 8386:4aad982111b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
inotify: Abstract the layer format and sizes to a inotify.common dictionary Instead of having a single possible request format, introduce a dictionary of possible messages in inotify.common
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Thu, 14 May 2009 15:48:47 +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