ready to merge trunk over SAMBA_3_0 ?

[Jeremy Allison]

On Thu, Feb 02, 2006 at 12:15:57AM -0600, Gerald (Jerry) Carter wrote:

> No.  Then we loose *all* the history on all the previous files (which may 
> not have been changed in trunk).  There's no need to change how we have 
> done this in the past. I don't really see any point is continuing to beat 
> a dead horse here.

Neigh ! :-). I agree, let's just merge across like we've always done...

Jeremy.