tests/test-merge-symlinks.out
author Patrick Mezard <pmezard@gmail.com>
Mon, 14 Apr 2008 22:31:34 +0200
changeset 6545 a7492fb2107b
parent 5408 36794dbe66a3
permissions -rw-r--r--
convert: fix svn branch source detection corner case It was confused by composite-looking revisions made by copy + remove.

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