[MERGE][0.10] re: make bzr work with diffutils >= 2.8.4

[Robert Collins]

On Fri, 2006-08-25 at 16:28 -0500, John Arbash Meinel wrote:

> I'm happy with the change (+1), and think it is reasonable to get it
> into bzr-0.10. I'm not sure if we'll backport an 0.9, considering
> 0.10-rc1 is set for release on Monday.
> 
> I changed the subject to hopefully make it obvious that this should be
> merged.
> 
> Also, we generally use the [MERGE] syntax, rather than [bundle]. Bundle
> is just an implementation detail.

+1 for 0.10.

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060826/6a62ff41/attachment.pgp