From owner-freebsd-current Tue Mar 7 22: 1:36 2000 Delivered-To: freebsd-current@freebsd.org Received: from relay.nuxi.com (nuxi.cs.ucdavis.edu [169.237.7.38]) by hub.freebsd.org (Postfix) with ESMTP id 3752737B521 for ; Tue, 7 Mar 2000 22:01:33 -0800 (PST) (envelope-from obrien@NUXI.com) Received: from dragon.nuxi.com (root@d60-024.leach.ucdavis.edu [169.237.60.24]) by relay.nuxi.com (8.9.3/8.9.3) with ESMTP id WAA78795; Tue, 7 Mar 2000 22:00:59 -0800 (PST) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.9.3/8.9.1) id WAA60836; Tue, 7 Mar 2000 22:01:09 -0800 (PST) (envelope-from obrien) Date: Tue, 7 Mar 2000 22:01:09 -0800 From: "David O'Brien" To: bwoods2@uswest.net Cc: freebsd-current@FreeBSD.ORG Subject: Re: sshd in current....no config files in /etc/ssh Message-ID: <20000307220109.B60604@dragon.nuxi.com> Reply-To: obrien@FreeBSD.ORG References: <200003071926.LAA75252@troutmask.apl.washington.edu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 1.0.1i In-Reply-To: ; from wwoods@cybcon.com on Tue, Mar 07, 2000 at 11:31:26AM -0800 X-Operating-System: FreeBSD 4.0-CURRENT Organization: The NUXI BSD group X-PGP-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Keyid: 34F9F9D5 Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Tue, Mar 07, 2000 at 11:31:26AM -0800, William Woods wrote: > Good god, I am saying that the files to merger dont exist....there is nothing > to merge... .... > > If you insist on doing it by hand, start with > > "diff -urN /etc /usr/src/etc" Perhaps you are not familar with the "-N" option to diff. -- -- David (obrien@NUXI.com) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message