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/sh

hg init
hg log
hg grep wah
hg manifest
hg verify