On Wednesday 12 January 2005 01:29, Iain Buchanan wrote: > On Tue, 2005-01-11 at 21:38 +0200, Yuval Scharf wrote: > > I got two config files that are supposed to be /etc/init.d/xprint > > They came from two different e-builds net-print/xprint and > > x11-base/xorg-x11. > > are you sure one of them came from xorg-x11? I have xorg-x11 installed, > and I don't have /etc/init.d/xprint...
Probably you don't have it because you don't have the xprint USE word set. I'm sure that it comes from xorg-x11: cgext03 root # qpkg -f /etc/init.d/xprint net-print/xprint * x11-base/xorg-x11 * > > > You should I do? How should I merge them? > > I use tkdiff to merge files, which is part of tkcvs. (You'll need > tcl/tk as well). It has a nice merge option. > I know how to merge files. The problem is that those files are totally different. Yuval Scharf -- [email protected] mailing list
