merge-directive glitch

[Aaron Bentley]

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

Robert Collins wrote:
> This is from my api_api branch, which I'm trying to submit a patch
> for :(. It generates a bundle just fine.

This is bug 120591.  Adeodato Simó has submitted a fix, but only I have
reviewed it so far:

http://bundlebuggy.aaronbentley.com/request/%3C20070617161306.GA23558@chistera.yi.org%3E

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

iD8DBQFGgQ6y0F+nu1YWqI0RAtEMAJ9D75xYf1/4RM/+hZDlbtGkz9zRwACgiHIk
Q5esVCP6CIkILIo2+YN6aFM=
=1Bqm
-----END PGP SIGNATURE-----