[MERGE REQUEST] hashcache for merge

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

panoramicfeedback.com:opensource/bzr.24/ revision 986 adds hashcache
support to merge.  This means that merges against working directories
are almost as fast as merges against revisions.  It also fixes a
longstanding bug that pathname changes without contents changes were
ignored by merge.

Revision 987 avoids some unnecessary inventory rewriting, and saves
about 3 sec when merging kernel trees.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFC8tYE0F+nu1YWqI0RAijPAJsGPJJSPRLvt7rlwBWFs+ab4nu/owCcDiNG
/Kx5YKVkyVvvdk47KAqsln8=
=FMFJ
-----END PGP SIGNATURE-----