view tests/test-symlink-addremove.out @ 6933:17bdcd59b9ad

keyword: avoid additional conflicts during merge/resolve

Make merge and resolve trigger kwtemplater.restricted to compare
data without keyword expansion.
The keyword stays outside the conflict:

$Keyword$
<<<<<<< local
bar
=======
foo
>>>>>>> other

and will again be expanded on commit.
Demonstrate in test case.

% directory moved and symlinked
adding foo/a
% now addremove should remove old files
adding bar/a
adding foo
removing foo/a