From owner-freebsd-current Tue Mar 7 22:51:21 2000 Delivered-To: freebsd-current@freebsd.org Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.54]) by hub.freebsd.org (Postfix) with ESMTP id 4F42337B5BB; Tue, 7 Mar 2000 22:51:15 -0800 (PST) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.9.3/8.9.3) id WAA78606; Tue, 7 Mar 2000 22:52:28 -0800 (PST) (envelope-from sgk) From: Steve Kargl Message-Id: <200003080652.WAA78606@troutmask.apl.washington.edu> Subject: Re: sshd in current....no config files in /etc/ssh In-Reply-To: <20000307220109.B60604@dragon.nuxi.com> from "David O'Brien" at "Mar 7, 2000 10:01:09 pm" To: obrien@FreeBSD.ORG Date: Tue, 7 Mar 2000 22:52:28 -0800 (PST) Cc: bwoods2@uswest.net, freebsd-current@FreeBSD.ORG X-Mailer: ELM [version 2.4ME+ PL61 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG David O'Brien wrote: > 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. > Who is the "you" you're refer to? I'm quite familiar with the -N option, and if you want to compare /etc with /usr/src/etc -N is handy. If you're intimating that -N implies -r that is not contained in diff(1). -- Steve To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message