On Thursday 13 January 2005 00:10, Iain Buchanan wrote: > On Wed, 2005-01-12 at 17:30 +0200, Yuval Scharf wrote: > > On Wednesday 12 January 2005 01:29, Iain Buchanan wrote: > > > > You should I do? How should I merge them? > > > > > > I use tkdiff to merge files > > > > I know how to merge files. The problem is that those files are totally > > different. > > I misunderstood "how should I merge them?"... Perhaps you should submit > a bug report. I would assume that this behaviour is not intended. In > terms of merging them, how about making your own with the two config > files (and the man page) as reference?
Thanks Lain, I don't think that it is a bug. I'll just have to go over the files and merge them. Yuval Scharf -- gentoo-user@gentoo.org mailing list
