From owner-doc-jp@jp.freebsd.org  Tue Mar 18 12:23:00 1997
Received: by jaz.jp.freebsd.org (8.8.5+2.7Wbeta5/8.7.3) id MAA03764
	Tue, 18 Mar 1997 12:23:00 +0900 (JST)
Received: by jaz.jp.freebsd.org (8.8.5+2.7Wbeta5/8.7.3) with SMTP id MAA03759
	for <doc-jp@jp.freebsd.org>; Tue, 18 Mar 1997 12:22:59 +0900 (JST)
Received: from amont.astec.co.jp (amont.astec.co.jp [172.20.10.1]) by tokyonet-entrance.astec.co.jp (8.6.12+2.5Wb7/3.4Wbeta5-astecMX2.3) with ESMTP id MAA06459 for <doc-jp@jp.freebsd.org>; Tue, 18 Mar 1997 12:22:58 +0900
Received: from domino.astec.co.jp (domino.astec.co.jp [172.20.10.12]) by amont.astec.co.jp (8.7.6/3.5Wbeta-astecMX2.4) with SMTP id MAA26584 for <doc-jp@jp.freebsd.org>; Tue, 18 Mar 1997 12:22:57 +0900 (JST)
Received: by domino.astec.co.jp (4.1/astec-1.0)
	id AA12995; Tue, 18 Mar 97 12:22:54 JST
Message-Id: <9703180322.AA12995@domino.astec.co.jp>
To: doc-jp@jp.freebsd.org
From: HANAI Hiroyuki <hanai@astec.co.jp>
In-Reply-To: Your message of "Mon, 17 Mar 1997 11:55:32 -0500 (EST)"
References: <9703171655.AA04705@jee.sm10.sciatl.com>
X-Mailer: Mew version 1.06 on Emacs 19.34.1, Mule 2.3
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Date: Tue, 18 Mar 1997 12:22:54 +0900
Reply-To: doc-jp@jp.freebsd.org
Precedence: bulk
X-Distribute: distribute [version 2.1 (Alpha) patchlevel=19]
X-Sequence: doc-jp 2686
Subject: [doc-jp 2686] Re: [Update] FAQ-hardware.sgml///was Re: FAQ.sgml
	 v.1.37 divided
Errors-To: owner-doc-jp@jp.freebsd.org
Sender: owner-doc-jp@jp.freebsd.org

$B$K$7$+$5$s(B>
> $ man diff
>    :
>  Syntax
> 
>     diff [ -befh ] file1 file2
>    :
> $
> 
> $B$H!"(Bed $B7A<0!J(Bed $B$N(Ba,c,d $B%3%^%s%I!K$N(B -e $B$HL5;XDj7A<0$,$"$k$/$i$$$G$9!#(B

$B$"$j$c$^(B, GNU $B$N(B diffutils $B$rF~$l$k$N$O2DG=$G$9$+(B?

> $B:9J,$NL\E*$O!"JQ99E@$N35N,DLCN!uJQ998D=j$N::FI$J$s$G$7$g$&$+!)$J$i!"(B
> $B8+$d$9$$$[$&$,$$$$$G$9$h$M!#(BSCO $B$N$O$I$A$i$b8+$K$/$$$H;W$&!JJQ998D=j$N(B
> $BA08e$N#2!A#39T$,I=<($5$l$J$$$N$G!"A08e4X78$,J,$+$j$^$;$s!K(B

$B$($C$H$G$9$M(B. $B:#$N$H$3$m$O(B, $B;d$N$H$3$m$K:G?7HG$,$"$k$O$:$G$"$j(B,
$B99?7$9$k:]$K$O(B diff $B$G$bA4J8$G$b$J$s$G$b$$$$$s$G$9(B.
$B$G(B, $B$b$&>/$7$7$?$i(B FAQ $B$b%=!<%9%D%j!<$KF~$l$^$9$M(B.
$B$=$&$9$k$H(B, $B99?7$O>o$K%=!<%9%D%j!<$KF~$C$F$kE[$N:G?7HG$K(B
$BBP$7$F9T$&$o$1$G$9(B.
$B$G(B, $B%O%s%I%V%C%/$G7P83$7$?$N$G$9$,(B, $B$_$J$5$s$,$/$l$k(B diff $B$,>o$K(B
$B%=!<%9%D%j!<Cf$N:G?7HG$KBP$9$k$b$N$G$O$J$$$3$H$,$=$l$J$j$K$"$k$N$G$9$M(B.
$B!t(B $B$$$m$$$m$J;v>p$,$"$j$^$9$+$i(B ;-)

$B$3$&$$$&>l9g(B, diff $B$@$H(B, $B%Q%C%A$,Ev$i$J$+$C$?$j$7$FIT@09g$,$o$+$j(B
$BBP=h$G$-$k$N$G$9$,(B, $BA4J8$rAw$i$l$k$H(B, $B%D%i%$$b$N$,$"$k$N$G$9$M(B.
$B%^%$%J!<$JJQ99$@$+$i;d$,>!<j$K99?7$7$F$*$/(B, $B$H$$$&$h$&$J$3$H$,$h$/(B
$B$"$k$N$G$9$,(B, $B$=$&$$$&$N$,L5BL$K$J$C$F$7$^$&2DG=@-$,$"$j$^$9(B.
$B$@$+$i(B, $B:G=*E*$K$O(B diff $B$,M_$7$$$G$9(B.
$B!t(B unified diff(diff -u) $B$d(B context diff(diff -c) $B$,M_$7$$$N$O(B,
$B!t(B $B$d$O$jFI$_$d$9$$$+$i$G$9(B.

> --- chat-jp ---
> 
> |   > ### $B$K$7$+$N$*CB@8F|%P!<%8%g%s$K$J$C$F$7$^$$$^$7$?(B
> |   
> |   $B$*$a$G$H$&$4$6$$$^$9(B.
> 
> $B!J0zMQ$N=g=xA08e$7$F$^$9$1$I!K$"$j$,$H$&$4$6$$$^$9!#(B
> $B$"!":P$NOC$O!&!&!&$7$J$$$G$/$@$5$$(B(^^);

$B$&$&$`!D(B
$B$=$l$OFM$C9~$s$G$/$l$H8@$C$F$k$h$&$J$b$N$G$9$M(B ;-)

--$B2V0f(B
