Bug#298788: [Quilt-dev] [peterc@gelato.unsw.edu.au: Bug#298788: Desirable new feature: quilt merge]

2005-03-10 Thread Catalin Marinas
Martin Quinson [EMAIL PROTECTED] wrote: also from the debian BTS. I dunno what to think about it. I never forked any patch, so I've no idea about merging them afterward ;) Assuming that you only try to merge forked patches, a diff3 merge could be performed between the common ancestor of all the

Bug#298788: [Quilt-dev] [peterc@gelato.unsw.edu.au: Bug#298788: Desirable new feature: quilt merge]

2005-03-10 Thread Catalin Marinas
Catalin Marinas [EMAIL PROTECTED] wrote: Martin Quinson [EMAIL PROTECTED] wrote: also from the debian BTS. I dunno what to think about it. I never forked any patch, so I've no idea about merging them afterward ;) Assuming that you only try to merge forked patches, a diff3 merge could be

Bug#298788: [Quilt-dev] [peterc@gelato.unsw.edu.au: Bug#298788: Desirable new feature: quilt merge]

2005-03-10 Thread Andreas Gruenbacher
On Thu, 2005-03-10 at 12:42, Martin Quinson wrote: Hello, also from the debian BTS. I dunno what to think about it. I never forked any patch, so I've no idea about merging them afterward ;) Thanks for your time, Mt. PS: as usual, it'd be cool if you could keep both the list and the bug