run-tests.py: pass -L/--label to simplemerge This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.

import doctest

import mercurial.changelog
# test doctest from changelog

doctest.testmod(mercurial.changelog)