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.
3210 files updated, 0 files merged, 1 files removed, 0 files unresolvedsub/b not presentsub not present