merge: introduce a clean_update() for that use-case
I find it hard to understand what value to pass for all the arguments
to `merge.update()`. I would like to introduce functions that are more
specific to each use-case. We already have `graft()`. This patch
introduces a `clean_update()` and uses it in some places to show that
it works.
Differential Revision: https://phab.mercurial-scm.org/D7902
#!/bin/sh
HGENCODING=UTF-8
export HGENCODING
echo ".. -*- coding: utf-8 -*-" > gendoc.txt
echo "" >> gendoc.txt
LANGUAGE=$1 "$PYTHON" "$TESTDIR/../doc/gendoc.py" >> gendoc.txt 2> /dev/null || exit
echo "checking for parse errors"
"$PYTHON" "$TESTDIR/../doc/docchecker" gendoc.txt
"$PYTHON" "$TESTDIR/../doc/runrst" html gendoc.txt /dev/null