Per file merge hook and 2.1.0rc2

[John Arbash Meinel]

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

We worked a bit on a new per-file merge hook, and it helped isolate some
deficiencies with the new hook. Specifically, state was not maintained
between files processed, causing all hooks to re-read all config info
for every file. We thought we had it, but the object we grabbed is not
persisted.

Anyway, Robert and I paired on an update which moves the hook to being
called at the beginning of the merge, returning an object that can then
be used for processing all files.

It is a fairly strong change to the api (not compatible at all), but
since I doubt many people are using the new one yet, I'm thinking to go
ahead and release an rc2 quickly.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAktinbsACgkQJdeBCYSNAAO2jgCfRvBuJR9ZMui99cMqC2t2uCYL
NPAAoK1bWz4S3AcGqELwhC9Wny05L281
=Dgok
-----END PGP SIGNATURE-----