From owner-FreeBSD-users-jp@jp.freebsd.org  Thu May  3 19:32:21 2001
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id TAA50199;
	Thu, 3 May 2001 19:32:21 +0900 (JST)
	(envelope-from owner-FreeBSD-users-jp@jp.FreeBSD.org)
Received: from patty.center.timedia.co.jp (eudora.timedia.co.jp [210.239.181.201])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id TAA50194
	for <FreeBSD-users-jp@jp.freebsd.org>; Thu, 3 May 2001 19:32:21 +0900 (JST)
	(envelope-from bugbird@timedia.co.jp)
Received: from timedia.co.jp (unknown [192.168.8.174])
	by patty.center.timedia.co.jp (Postfix) with ESMTP id 5E603F9F02
	for <FreeBSD-users-jp@jp.freebsd.org>; Thu,  3 May 2001 19:35:55 +0900 (JST)
Message-ID: <3AF13349.DE964613@timedia.co.jp>
Date: Thu, 03 May 2001 19:30:33 +0900
From: Toshiboumi bugbird Ohta <bugbird@timedia.co.jp>
Organization: Time Intermedia Corp.
X-Mailer: Mozilla 4.75 [ja] (Win98; U)
X-Accept-Language: ja
MIME-Version: 1.0
To: FreeBSD-users-jp@jp.freebsd.org
References: <62587.988253806@ideon.st.ryukoku.ac.jp> <200104260317.MAA14508@pluto587.pluto.ai.kyutech.ac.jp> <20010503182542.2F62.CHORES@him.ne.jp>
Content-Type: text/plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Reply-To: FreeBSD-users-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+010328
X-Sequence: FreeBSD-users-jp 61162
Subject: [FreeBSD-users-jp 61162] Re: =?ISO-2022-JP?B?GyRCJE8kOBsoQg==?=
 =?ISO-2022-JP?B?GyRCJGEkRiROGyhC?= cvsup(Re: 4.3-R at ftpserver)
Errors-To: owner-FreeBSD-users-jp@jp.freebsd.org
Sender: owner-FreeBSD-users-jp@jp.freebsd.org
X-Originator: bugbird@timedia.co.jp

$BB@ED!w%?%$%`%$%s%?!<%a%G%#%"!!$H!!$b$&$7$^$9(B

chores@him.ne.jp wrote:
<snip>
> /etc/* $B$N99?7$r$-$A$s$H$d$k$K$O!"$I$&$7$?$i$h$$$N$G$7$g$&$+(B?

 mergemaster(8) $B$H$$$&%3%^%s%I$r;H$&$3$H$K$J$j$^$9!#(B

$B!!(Bsee
	man mergemaster

	[FreeBSD-users-jp 58342] Re: sshd on 4.2-STABLE

$B!!$,!">>K\$5$s$N5-;v$N;XE&$K$b$"$j$^$9$,!">!<j$,H=$k$^$G$O(B
$B9s$$L\$K2q$&2DG=@-$,>/$J$+$i$:$"$j$^$9!#(B

$B!!(B/etc/* $B$N%U%!%$%k$N5-=RFbMF$KBg$-$/0MB8$9$k$3$H$K$J$k4p44(B
$B%5!<%P$J$I$G<B;\$9$k>l9g$K$O!"?5=E$K9TF0$9$k$Y$-$G$9!#(B
