On Sat, 29 Dec 2001, Alan Cox wrote:
> The big exception is Configure.help which is a nightmare for patch, and the
> one file I basically always did hand merges on
Perhaps it would help if the entries in Configure.help were sorted?
It's very difficult to merge anything in that file, since in many cases the
`new' entries added by the new patch, already existed in our local tree
(speaking about m68k). Someone just wrote new explanations, and inserted them
someplace else in the file.
Gr{oetje,eeting}s,
Geert
-- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.orgIn personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Mon Jan 07 2002 - 21:00:17 EST