merge: restate calculateupdates in terms of a matcher
Once we get a matcher down into manifestmerge, we can make narrowhg
work more easily and potentially let manifest.match().diff() do less
work in manifestmerge.
mercurial (__VERSION__) unstable; urgency=medium
* Automated build performed by upstream.
-- Mercurial Devel <mercurial-devel@selenic.com> __DATE__