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.
# should print nothing# should print ? b/x? b/x# should print A b/xA b/x# should forget b/xforgetting b/x# should print nothing