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: error: Connection refused
255
copy: No such file or directory
abort: HTTP Error 404
0