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 a
ln -s a link
cd a
echo foo > foo
hg status
hg status ../link