From owner-freebsd-current Tue Mar 7 11:25:12 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 C7E9537BFF5 for ; Tue, 7 Mar 2000 11:25:09 -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 LAA75252; Tue, 7 Mar 2000 11:26:07 -0800 (PST) (envelope-from sgk) From: Steve Kargl Message-Id: <200003071926.LAA75252@troutmask.apl.washington.edu> Subject: Re: sshd in current....no config files in /etc/ssh In-Reply-To: from William Woods at "Mar 7, 2000 11:15:49 am" To: bwoods2@uswest.net Date: Tue, 7 Mar 2000 11:26:07 -0800 (PST) Cc: Jay Oliver , 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 William Woods wrote: > OK, well, I useally merge files by hand because I am not familiar with > mergemaster......how would I do this by hand? > man mergemaster If you insist on doing it by hand, start with "diff -urN /etc /usr/src/etc" -- Steve To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message