tests/test-merge-symlinks.out
author Kirill Smelkov <kirr@landau.phys.spbu.ru>
Sat, 13 Oct 2007 15:25:11 +0400
changeset 5462 91a522a69c13
parent 5408 36794dbe66a3
permissions -rw-r--r--
convert: svn -- fix tags handling They were simply not detected.

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