gnumaniak: release sdiff.1 [JM:00380]

[linuxjm/jm.git] / manual / gnumaniak / release / man1 / sdiff.1

.\" You may copy, distribute and modify under the terms of the LDP General
.\" Public License as specified in the LICENSE file that comes with the
.\" gnumaniak distribution
.\"
.\" The author kindly requests that no comments regarding the "better"
.\" suitability or up-to-date notices of any info documentation alternative
.\" is added without contacting him first.
.\"
.\" (C) 2002 Ragnar Hojland Espinosa <ragnar@ragnar-hojland.com>
.\"
.\"     GNU sdiff man page
.\"     man pages are NOT obsolete!
.\"     <ragnar@ragnar-hojland.com>
.\"
.\" Japanese Version Copyright (c) 2000 NAKANO Takeo all rights reserved.
.\" Translated Sun 12 Mar 2000 by NAKANO Takeo <nakano@apm.seikei.ac.jp>
.\" Updated & Modified Sat Jan 24 17:28:45 JST 2004
.\"         by Yuichi SATO <ysato444@yahoo.co.jp>
.\" Updated Wed Aug 10 15:51:58 JST 2011
.\"         by TACHIBANA Akira <tati@kc5.so-net.ne.jp>
.\"
.\"WORD:        gutter          ¤Î¤É
.\"
.TH SDIFF 1 "October 2002" "GNU diff Utilities 2.8.1"
.SH ̾Á°
sdiff \- 2 ¤Ä¤Î¥Õ¥¡¥¤¥ë¤Î°ã¤¤¤ò¸«¤Ä¤±¡¢ÂÐÏÃŪ¤Ë¥Þ¡¼¥¸¤ò¹Ô¤¦
.SH ½ñ¼°
.B sdiff
[\fB\-abdilstBEHW\fR] [\fB\-o \fIOUTFILE\fR] [\fB\-w \fICOLUMNS\fR]
[\fB\-I \fIREGEXP\fR] [\fB\-\-diff\-program=\fIPROGRAM\fR]
[\fB\-\-expand-tabs\fR] [\fB\-ignore\-all\-space\fR]
[\fB\-ignore\-blank\-lines\fR] [\fB\-\-ignore\-case\fR]
[\fB\-\-ignore\-matching\-lines=\fIREGEXP\fR]
[\fB\-\-ignore\-space\-change\fR]
[\fB\-\-ignore\-tab\-expansion\fR]
[\fB\-\-left\-column\fR] [\fB\-\-minimal\fR]
[\fB\-\-output=\fIOUTFILE\fR] 
[\fB\-\-speed\-large\-files\fR]
[\fB\-\-strip\-trailing\-cr\fR]
[\fB\-\-supress\-common\-lines\fR] 
[\fB\-\-text\fR] [\fB\-\-width=\fICOLUMNS\fR]
.I FROMFILE TOFILE

.B sdiff
[\fB-v\fR] [\fB\-\-help\fR] [\fB\-\-version\fR]
.SH ÀâÌÀ
.B sdiff
¤Ï 2 ¤Ä¤Î¥Õ¥¡¥¤¥ë¤ò¥Þ¡¼¥¸¤¹¤ë¡£
.B \-o
¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤ÏÂÐÏÃŪ¤Ë¥Þ¡¼¥¸¤·¤¿·ë²Ì¤ò
.I OUTFILE
¤Ë½ÐÎϤ¹¤ë¡£¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï side-by-side ·Á¼°¤Ç°ã¤¤¤òɽ¼¨¤¹¤ë¤À¤±¤Ç¤¢¤ë¡£

.I FROMFILE
¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Ç
.I TOFILE
¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ê¤¤¾ì¹ç¡¢
.B sdiff
¤Ï
.I FROMFILE
¤Ë¤¢¤ë¡¢¥Õ¥¡¥¤¥ë̾¤¬
.I TOFILE
¤ÈƱ¤¸¤â¤Î¤òÈæ³Ó¤ÎÂоݤˤ¹¤ë (µÕ¤âƱ¤¸)¡£
.IR FROMFILE " ¤È " TOFILE
¤ÎξÊý¤Ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Ê¤¤¡£
ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ë
.RB ` \- '
¤òÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Ê¤¤¡£
[ÌõÃí: ¿¤¯¤Î¥³¥Þ¥ó¥É¤Ç¤Ï
.RB ` \- '
¤Ïɸ½àÆþÎϤΰÕÌ£¤Ë¤Ê¤ë]

Ä̾ï
.B sdiff
¤Ï
.B diff 
¤ò¸Æ¤Ó½Ð¤·¤Æ½èÍý¤ò¹Ô¤¦¡£
¤·¤«¤·
.B DIFF
´Ä¶­ÊÑ¿ô¤ò¾¤Î¥×¥í¥°¥é¥à¤ËÀßÄꤹ¤ì¤Ð¡¢¤½¤Î¥×¥í¥°¥é¥à¤ò»È¤¦¤è¤¦¤ËÊѹ¹¤Ç¤­¤ë¡£
¤Þ¤¿
.B EDITOR
´Ä¶­ÊÑ¿ô¤òÀßÄꤹ¤ë¤È¡¢»ÈÍѤ¹¤ë¥¨¥Ç¥£¥¿¤âÊѹ¹¤Ç¤­¤ë¡£
.SH ¥ª¥×¥·¥ç¥ó
.TP
.B \-a, \-\-text
¥Æ¥­¥¹¥È¤Î¤è¤¦¤Ë¸«¤¨¤Ê¤¤¥Õ¥¡¥¤¥ë¤¬¤¢¤Ã¤Æ¤â¡¢
Á´¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò¥Æ¥­¥¹¥È¤È¤ß¤Ê¤·¤Æ 1 ¹Ô¤º¤ÄÈæ³Ó¤·¤Æ¤¤¤¯¡£
.TP
.B \-b, \-\-ignore\-space\-change
¶õÇò¤Î¿ô¤Î°ã¤¤¤ò̵»ë¤¹¤ë¡£
.TP
.B \-d, \-\-minimal
¥¢¥ë¥´¥ê¥º¥à¤òÊѹ¹¤¹¤ë (¤ª¤½¤é¤¯¾®¤µ¤Ê°ã¤¤¤â¸«ÉÕ¤«¤ë¤è¤¦¤Ë¤Ê¤ë)¡£
¤³¤ì¤òÍѤ¤¤ë¤È
.B sdiff
¤ÏÃÙ¤¯¤Ê¤ë (»þ¤Ë¤ÏÈó¾ï¤ËÃÙ¤¯¤Ê¤ë)¡£
.TP
.B \-i, \-\-ignore\-case
±ÑÂçʸ»ú¤È¾®Ê¸»ú¤Î°ã¤¤¤ò̵»ë¤¹¤ë¡£
.TP
.B \-l, \-\-left\-column
¶¦Ä̤ιԤËÂФ·¤Æ¤Ï¡¢º¸Â¦¤ÎÎó¤À¤±¤òɽ¼¨¤¹¤ë¡£
.TP
.BI "\-o " OUTFILE ", \-\-output=" OUTFILE
¥Þ¡¼¥¸¤µ¤ì¤¿½ÐÎϤò
.I OUTFILE
¤Ë½ñ¤­¹þ¤à¡£¥Þ¡¼¥¸¤ò¹Ô¤¦¤¿¤á¤Ë¤Ï¤³¤Î¥ª¥×¥·¥ç¥ó¤¬É¬ÍפǤ¢¤ë¡£
.TP
.B \-s, \-\-suppress\-common\-lines
¶¦Ä̤ʹԤòɽ¼¨¤·¤Ê¤¤¡£
.TP
.B \-t, \-\-expand\-tabs
½ÐÎϤǥ¿¥Öʸ»ú¤ò¥¹¥Ú¡¼¥¹¤ËÊÑ´¹¤¹¤ë¡£
ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ç¤Î¥¿¥Öʸ»ú¤Ë¤è¤ë·å·¤¨¤¬Êݸ¤µ¤ì¤ë¡£
.TP
.BI "\-w " COLUMNS ", \-\-width=" COLUMNS
½ÐÎϤÎÉý¤ò
.I COLUMNS
·å¤Ë¤¹¤ë¡£
Îò»ËŪ¤ÊÍýͳ¤«¤é¡¢
.BR diff (1)
¤Ç¤Ï¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï
.B \-W
¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤³¤È¤ËÃí°Õ¡£
.TP
.B \-B, \-\-ignore\-blank\-lines
¶õ¹Ô¤òÁÞÆþ¡¦ºï½ü¤¹¤ë¤À¤±¤Î°ã¤¤¤Ï̵»ë¤¹¤ë¡£
.TP
.B \-E, \-\-ignore\-tab\-expansion
¥¿¥ÖŸ³«¤Ë¤è¤ë¥¹¥Ú¡¼¥¹¤ÎÊѹ¹¤ò̵»ë¤¹¤ë¡£
.TP
.B \-H, \-\-speed\-large\-files
¾®¤µ¤ÊÊѹ¹¤¬ÂçÎ̤ˤ¢¤ë¤è¤¦¤ÊÂ礭¤Ê¥Õ¥¡¥¤¥ë¤ò¹â®¤Ë°·¤¦¤¿¤á¤Ë¡¢
ȯ¸«Åª¿ä¬¼êË¡¤òÍѤ¤¤ë¡£
.TP
.BI "\-I " REGEXP ", \-\-ignore\-matching\-lines=" REGEXP
Àµµ¬É½¸½
.I REGEXP
¤Ë¥Þ¥Ã¥Á¤·¤¿¹Ô¤òÁÞÆþ¡¦ºï½ü¤¹¤ë¤À¤±¤Î°ã¤¤¤Ï̵»ë¤¹¤ë¡£
.TP
.B \-W
¹Ô¤ÎÈæ³Ó¤ÎºÝ¤Ë¶õÇò¤ò̵»ë¤¹¤ë¡£
Îò»ËŪ¤ÊÍýͳ¤«¤é¡¢
.BR diff (1)
¤Ç¤Ï¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï
.B \-w
¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤³¤È¤ËÃí°Õ¡£
.TP
.B \-\-diff\-program= \fIPROGRAM
¥Õ¥¡¥¤¥ë¤ÎÈæ³Ó¤¹¤ë¤¿¤á¤Ë \fBdiff\fR ¤È¸ß´¹À­¤Î¤¢¤ë
³°Éô¥×¥í¥°¥é¥à \fIPROGRAM\fR ¤òÍѤ¤¤ë¡£
.TP
.B \-\-strip\-trailing\-cr
¹ÔËö¤Î CR ¤ò¼è¤ê½ü¤¯¡£
¹ÔËö¤Î¥Þ¡¼¥«¤È¤·¤Æ CRLF ¤ò»È¤¦¥·¥¹¥Æ¥à¤Î½ÐÎϤò½èÍý¤¹¤ë¤È¤­¤ËÌòΩ¤Ä¡£
.TP
.B "\-\-help"
ɸ½à½ÐÎϤ˻ÈÍÑÊýË¡¤Î¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤ÆÀµ¾ï½ªÎ»¤¹¤ë¡£
.TP
.B \-v, \-\-version
.B sdiff
¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ò½ÐÎϤ¹¤ë¡£
.SH ¥Þ¡¼¥¸
¶¦Ä̹ԤΥ֥í¥Ã¥¯ (¶õÇò¤Î¡Ö¤Î¤É (gutter)¡×¤ò¶´¤ó¤Çº¸±¦¤Ëɽ¼¨¤µ¤ì¤ë) ¤Ï¡¢
1 ÈÖÌܤΥե¡¥¤¥ë¤«¤é½ÐÎϤ˥³¥Ô¡¼¤µ¤ì¤ë¡£
º¹°Û¤Î¤¢¤ë¹Ô¥Ö¥í¥Ã¥¯¤Î¤¢¤È¤Ç¤Ï¡¢
.B sdiff
¤Ï
.RB ` % '
¤ò¥×¥í¥ó¥×¥È¤È¤·¤Æ½Ð¤·¤Æ°ì»þÄä»ß¤·¡¢
°Ê²¼¤Î¥³¥Þ¥ó¥É¤Î¤É¤ì¤« 1 ¤Ä¤¬ÆþÎϤµ¤ì¤ë¤Î¤òÂԤġ£
.IP "[ÌõÃí]:" 8
¡Ö¤Î¤É (gutter)¡×¤È¤Ï¡¢°õºþÍѸì¤Çº¸±¦¤Î¥Ú¡¼¥¸¤Î´Ö¤Ë¤¢¤ëÉôʬ (¤¹¤Ê¤ï¤Á¡¢
ÀÞ¤êÌܤˤʤë¤È¤³¤í) ¤ò»Ø¤¹¡£¤³¤Î¥Þ¥Ë¥å¥¢¥ë¤Ç¤Ï¡¢Âбþ¤¹¤ë¹Ô¤ÎÃæ´Ö¤Ë¤¢¤ë¡¢
¶èÀڤ국¹æ¤òÃÖ¤¯¾ì½ê¤ò°ÕÌ£¤·¤Æ¤¤¤ë¡£¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
.BR diff (1)
¤Î¡Öside-by-side ·Á¼°¡×¤ò»²¾È¤¹¤ë¤³¤È¡£
.TP
.B e
ξÊý¤Î¥Ð¡¼¥¸¥ç¥ó¤È¤â¼Î¤Æ¤ë¡£ÆâÍƤ¬¶õ¤Î°ì»þ¥Õ¥¡¥¤¥ë¤ò¥Æ¥­¥¹¥È¥¨¥Ç¥£¥¿¤Ç³«¤­¡¢
¥¨¥Ç¥£¥¿½ªÎ»¸å¤Î¥Õ¥¡¥¤¥ë¤ÎÆâÍƤò½ÐÎϤ˥³¥Ô¡¼¤¹¤ë¡£
.TP 
.B eb
ξÊý¤Î¥Ð¡¼¥¸¥ç¥ó¤ò·ë¹ç¤·¤¿·ë²Ì¤ò¥¨¥Ç¥£¥¿¤ÇÊÔ½¸¤·¡¢
½ªÎ»¸å¤ÎÆâÍƤò½ÐÎϤ˥³¥Ô¡¼¤¹¤ë¡£
.TP
.B ed
.RB ` eb ',
¤È»÷¤Æ¤¤¤ë¤¬¡¢³Æ¥Ð¡¼¥¸¥ç¥ó¤Î¥Ö¥í¥Ã¥¯¤ÎÁ°¤Ë¥Ø¥Ã¥À¤òÃÖ¤­¡¢
¤É¤Î¥Õ¥¡¥¤¥ë¤Î¤É¤Î¹Ô¤Î¤â¤Î¤«¤¬¤ï¤«¤ë¤è¤¦¤Ë¤¹¤ë¡£
.TP     
.B el
º¸Â¦¤Î¥Ð¡¼¥¸¥ç¥ó¤ò¥¨¥Ç¥£¥¿¤ÇÊÔ½¸¤·¡¢
½ªÎ»¸å¤ÎÆâÍƤò½ÐÎϤ˥³¥Ô¡¼¤¹¤ë¡£
.TP
.B er
±¦Â¦¤Î¥Ð¡¼¥¸¥ç¥ó¤ò¥¨¥Ç¥£¥¿¤ÇÊÔ½¸¤·¡¢
½ªÎ»¸å¤ÎÆâÍƤò½ÐÎϤ˥³¥Ô¡¼¤¹¤ë¡£
.TP
.B l
º¸Â¦¤Î¥Ð¡¼¥¸¥ç¥ó¤ò½ÐÎϤ˥³¥Ô¡¼¤¹¤ë¡£
.TP
.B q
½ªÎ»¤¹¤ë¡£
.TP
.\":tati:¢­¤Ï p ¤Ç¤Ê¤¯ r
.B r
±¦Â¦¤Î¥Ð¡¼¥¸¥ç¥ó¤ò½ÐÎϤ˥³¥Ô¡¼¤¹¤ë¡£
.TP
.B s
¶¦Ä̤ʹԤòɽ¼¨¤»¤º¤Ë¥³¥Ô¡¼¤¹¤ë¡£
.TP
.B v
¶¦Ä̤ʹԤòɽ¼¨¤·¤Ê¤¬¤é¥³¥Ô¡¼¤¹¤ë¡£¥Ç¥Õ¥©¥ë¥È¡£
.SH ÊÖ¤êÃÍ
.B sdiff
¤Ï°Ê²¼¤Î¤É¤ì¤«¤ÎÃͤǽªÎ»¤¹¤ë:
.TP
.B 0
.B sdiff
¤ÏÀ®¸ù¤·¡¢º¹°Û¤Ï¸ºß¤·¤Ê¤«¤Ã¤¿¡£
.TP
.B 1
º¹°Û¤¬¸«ÉÕ¤«¤Ã¤¿¡£
.TP
.B 2
²¿¤é¤«¤Î¥¨¥é¡¼¤¬µ¯¤³¤Ã¤¿¡£
.SH ´ØÏ¢¹àÌÜ
.BR cmp (1),
.BR comm (1),
.BR diff (1),
.BR diff3 (1)
.SH Ãí°Õ
¥×¥í¥°¥é¥à¤Î¥Ð¥°¤Ë¤Ä¤¤¤Æ¤Ï bug-gnu-utils@gnu.org ¤ËÊó¹ð¤·¤Æ¤¯¤À¤µ¤¤¡£
¥Ú¡¼¥¸¤Î¹¹¿·¤Ï Ragnar Hojland Espinosa
<ragnar@ragnar-hojland.com> ¤¬¹Ô¤Ã¤Æ¤¤¤Þ¤¹¡£