Date: Tue, 15 Oct 2002 05:26:58 -0700 (PDT) From: David Wolfskill <david@catwhisker.org> To: shamrock@cypherpunks.to Cc: stable@freebsd.org Subject: Re: Mergemaster [was: Re: Ifconfig config of gif tunnels] Message-ID: <200210151226.g9FCQw0L031967@bunrab.catwhisker.org> In-Reply-To: <004401c2742a$d6169d90$6501a8c0@VAIO650>
next in thread | previous in thread | raw e-mail | index | archive | help
>From: "Lucky Green" <shamrock@cypherpunks.to> >Date: Tue, 15 Oct 2002 02:11:22 -0700 >... What would also be >helpful, though this may be diff's fault, would be if there were less >tendency for mergemaster to combine changes the admin likely wants to >make (adding a new user the OS requires) with changes the admin does not >want to make (removing surrounding entries out of master.passwd), >requiring the admin to make a note of mergemaster's suggestions followed >by editing the file by hand. Even to the extent that this happens, it "requires" no such response from the person running mergemaster. Rather, consider using the "e b" response to "edit both [old and new sets of lines]". Cheers, david (links to my resume at http://www.catwhisker.org/~david) -- David H. Wolfskill david@catwhisker.org To paraphrase David Hilbert, there can be no conflicts between the discipline of systems administration and Microsoft, since they have nothing in common. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210151226.g9FCQw0L031967>