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
echo "[extensions]" >> $HGRCPATH
echo "churn=" >> $HGRCPATH
COLUMNS=80; export COLUMNS
echo % create test repository
hg init repo
cd repo
echo a > a
hg ci -Am adda -u user1
echo b >> a
echo b > b
hg ci -Am addb -u user2
echo c >> a
echo c >> b
echo c > c
hg ci -Am addc -u user3
echo % churn all
hg churn
echo % churn up to rev 1
hg churn -r :1
echo % churn with aliases
cat > ../aliases <<EOF
user1 alias1
user3 alias3
EOF
hg churn --aliases ../aliases
echo % churn with column specifier
COLUMNS=40 hg churn