Test a merge of a symlink against an executable file.
This should result in a conflict, but the symlink always wins.
abort: file .../test-symlink-basic/a/dangling not tracked!
changeset: 0:cabd88b706fc
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
files: dangling
description:
add symlink
2564acbe54bbbedfbf608479340b359f04597f80 644 @ dangling
% rev 0:
dangling -> nothing
% rev 1:
dangling -> void
% modifying link
dangling -> empty
% reverting to rev 0:
reverting dangling
dangling -> nothing
% backups:
dangling.orig -> empty
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% copies
copying dangling to dangling2
A dangling2
dangling
dangling -> void
dangling2 -> void