[MERGE] Bzr diff produces -p1 diffs

[Aaron Bentley]

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

Okay, merged.

Putting the 'a' in the '=== filename' is probably overkill, though.

I've updated bzrtools, too.  This change broke shelf, in particular.

Aaron

Robey Pointer wrote:
> 
> On 28 Feb 2006, at 18:48, Michael Ellerman wrote:
> 
>> Sure.
>> <diffp1.patch>
> 
> 
> +1
> 
> I do think this will be more useful in the future when branch nicks  are
> used instead, but I understand wanting to at least get the '-p1'  part
> in first.
> 
> robey
> 
> 

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

iD8DBQFEBg9b0F+nu1YWqI0RAnNYAJsECCSN54xnsDkYmVDOCr9R57cVQwCggOa7
B4XvAZodzeEqpfHSih+XTM8=
=vYOQ
-----END PGP SIGNATURE-----