view tests/helper-runtests.sh @ 46497:4a012e531066

diff: extract function for getting possibly re-merged parent to diff against

We'll want to reuse the logic that `hg diff --change` with
`diff.merge` uses. At least `hg log -p` should reuse it. This patch
therefore extracts that code to a function.

Differential Revision: https://phab.mercurial-scm.org/D9957

#
# Avoid interference from actual test env:

unset HGTEST_JOBS
unset HGTEST_TIMEOUT
unset HGTEST_PORT
unset HGTEST_SHELL