From owner-FreeBSD-users-jp@jp.FreeBSD.org Mon Apr 14 22:03:29 2003
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) id h3ED3Tj78387;
	Mon, 14 Apr 2003 22:03:29 +0900 (JST)
	(envelope-from owner-FreeBSD-users-jp@jp.FreeBSD.org)
Received: from ns.nanet.co.jp ([2001:268:304::80])
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) with ESMTP/inet6 id h3ED3TY78380
	for <FreeBSD-users-jp@jp.FreeBSD.org>; Mon, 14 Apr 2003 22:03:29 +0900 (JST)
	(envelope-from kei@nanet.co.jp)
From: Katsuyuki Maeda <kei@nanet.co.jp>
To: FreeBSD-users-jp@jp.FreeBSD.org
Message-Id: <20030414215041.3F79.KEI@nanet.co.jp>
MIME-Version: 1.0
Content-Type: text/plain; charset="ISO-2022-JP"
Content-Transfer-Encoding: 7bit
X-Mailer: Becky! ver. 2.05.06
Reply-To: FreeBSD-users-jp@jp.FreeBSD.org
Precedence: list
Date: Mon, 14 Apr 2003 22:02:04 +0900
X-Sequence: FreeBSD-users-jp 74114
Subject: [FreeBSD-users-jp 74114] mergemaster
 =?ISO-2022-JP?B?GyRCJEclbSE8JSslayRHSlQ9OCQ3JEYkJCRKJCQbKEI=?=
 =?ISO-2022-JP?B?GyRCJVUlISUkJWskcjwrRjBFKhsoQg==?=
 =?ISO-2022-JP?B?GyRCJEs+ZT1xJC0kOSRrGyhC?= 
Sender: owner-FreeBSD-users-jp@jp.FreeBSD.org
X-Originator: kei@nanet.co.jp
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+030405

$B!!$3$s$K$A$O!#(Bkei@nanet$B$G$9!#(B

$B!!0JA0$+$i!"C/$+$KJ9$-$?$$$J$H;W$C$F$?$s$G$9$,!"(B
$B!V$=$l$/$i$$<+J,$GD4$Y$m!W$H8@$o$l$=$&$GJ9$1$J$+$C$?(B
$B$3$H$rJ9$-$^$9!#(B

$B!!$$$D$b!"(Bmake installworld $B$N8e$K!"(B
$B!!(Bmergemaster -siva; mergemaster -sivr
$B!!$7$F$$$k$s$G$9$,!"$3$l$ONI$/$d$k$"$jJ}$G$9$h$M!)(B
$B!t$R$g$C$H$7$F!";H$$J}$r4V0c$C$F$k!)(B

$B!!@N$O!"<j:n6H$G%^!<%8$7$F$$$?$3$H$r9M$($k$H!"$0!<$?$i$K(B
$B$J$C$F$k$H$O;W$$$^$9$,!"<+J,$G$O$^$C$?$/$$$8$C$F$$$J$$(B
$B%U%!%$%k$b(B diff$B$5$l$F!"%$%s%9%H!<%k$9$k$h$C$FEz$($J$$$H(B
$B$$$1$J$$$N$,LLE]$K;W$$$^$9!#(B

$B!!$$$8$C$F$$$J$$%U%!%$%k$O>!<j$K%$%s%9%H!<%k$9$k$H$+$$$&(B
$B%*%W%7%g%s$,$"$l$P!"$=$l$O$=$l$GJXMx$@$H;W$&$N$G$9$,!"(B
$B4{$K$I$3$+$G3+H/:Q$_$J$N$G$7$g$&$+!)(B

-- 
Nagasaki Network Service (http://www.nanet.co.jp/)
 kei@nanet.co.jp <Katsuyuki Maeda> (http://www.nanet.co.jp/~kei/)
 kei-neverread@nanet.co.jp (for spam ONLY $B%4%_H"D>9TJX(B)
$B!V=*$o$i$J$$%W%m%8%'%/%H$O$J$$!#=*$o$C$A$c$&%W%m%8%'%/%H$O$"$k$1$I!#!W(B

