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.
#!/bin/shhg init aln -s a linkcd aecho foo > foohg statushg status ../link