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.
% Without -v
access log created - .hg/hgrc respected
% errors
% With -v
listening at http://localhost/ (bound to 127.0.0.1)
% errors
% With --prefix foo
listening at http://localhost/foo/ (bound to 127.0.0.1)
% errors
% With --prefix /foo
listening at http://localhost/foo/ (bound to 127.0.0.1)
% errors
% With --prefix foo/
listening at http://localhost/foo/ (bound to 127.0.0.1)
% errors
% With --prefix /foo/
listening at http://localhost/foo/ (bound to 127.0.0.1)
% errors