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.
*** failed to import extension badext: invalid syntax (badext.py, line 1)hg help [COMMAND]show help for a command, extension, or list of commands