tests/test-revert-flags

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.

#!/bin/sh

"$TESTDIR/hghave" execbit || exit 80

hg init repo
cd repo
echo foo > foo
chmod 644 foo
hg ci -qAm '644'

chmod 755 foo
hg ci -qAm '755'

echo '% reverting to rev 0'
hg revert -a -r 0
hg st
hg diff --git