merge: fix spurious merges for copies in linear updates
We make better use of contexts to accurately identify copies that
don't need merges.
Add a simple test and update other tests.
import doctestimport mercurial.changelog# test doctest from changelogdoctest.testmod(mercurial.changelog)