[MERGE] Tweaks for merge directives

[Aaron Bentley]

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

John Arbash Meinel wrote:
> Aaron Bentley wrote:
> What about following the rule that Bundles and patches do, which is that
> they will move through lines until they find one which matches, and only
> if they make it to the end will it raise an error. (Bundle also tries to
> look for things that are close, so it can raise a
> UnsupportedBundleVersion sort of error, rather than just NotABundle).

Good thought.  Here you go.

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

iD8DBQFF9Cvl0F+nu1YWqI0RAtMAAJ9/We1LW6gKGbXbclDyWvmfFxbVHQCfQTrQ
qIkpltjubQ01jYVpMx5ALsY=
=xgb6
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-directive-tweaks2.patch
Type: text/x-patch
Size: 11419 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070311/329e87ca/attachment.bin