[MERGE] Bzr diff produces -p1 diffs

[Matthew D. Fuller]

On Thu, Mar 02, 2006 at 07:13:55PM +1100 I heard the voice of
Martin Pool, and lo! it spake thus:
> 
> Yes, I think --prefix or --no-prefix is fine.

One neat advantage of having the option is that you could add on args
to it for configuring the leader; e.g., "--prefix=orig,mod".  And you
could even construct -p2 if you wanted with something like
"--prefix=bzr/old,bzr/new" without having to add more options or
fiddle with the code.


-- 
Matthew Fuller     (MF4839)   |  fullermd at over-yonder.net
Systems/Network Administrator |  http://www.over-yonder.net/~fullermd/
           On the Internet, nobody can hear you scream.