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.
abort: index 00changelog.i unknown format 2!abort: requirement 'indoor-pool' not supported!