Matt Mackall <mpm@selenic.com> [Tue, 08 May 2007 02:59:13 -0500] rev 4416
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.