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.

adding a
adding b
0
0
0
a: No such file in rev 03f6b0774996
1