DIFF

̾Á°

½ñ¼°

diff [-v] [--help] [--version]

ÀâÌÀ

¤â¤Ã¤È¤â´Êñ¤Ê¾ì¹ç¤Ï¡¢Èæ³ÓÂоݤΥե¡¥¤¥ë¤Ï FROMFILE ¤È TOFILE ¤Ç¤¢¤ë¡£¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Î¤¦¤Á¤Î¤É¤Á¤é¤«¤Ï `-' ¤È»ØÄꤷ¤Æ¤âÎɤ¤¡£¤³¤Î»þ¤Ï¤½¤Î¥Õ¥¡¥¤¥ë¤Ïɸ½àÆþÎϤ«¤éÆɤ߹þ¤Þ¤ì¤ë¡£

FROMFILE ¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Ç TOFILE ¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤Ê¤¤¾ì¹ç¡¢ diff ¤Ï¥Ç¥£¥ì¥¯¥È¥ê FROMFILE ¤Ë¤¢¤ë¡¢¥Õ¥¡¥¤¥ë̾¤¬ TOFILE ¤Î¥Õ¥¡¥¤¥ë¤òÈæ³ÓÂоݤˤ¹¤ë (µÕ¤âƱÍÍ)¡£ ¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ê¤¤Êý¤Î»ØÄê¤ò `-' ¤Ë¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Ê¤¤¡£

ξÊý¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Î¤È¤­¤Ï¡¢ diff ¤ÏÁÐÊý¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë¡¢Âбþ¤¹¤ë¥Õ¥¡¥¤¥ë¤ò ¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç¤Ë¤½¤ì¤¾¤ìÈæ³Ó¤¹¤ë¡£ Èæ³Ó¤ÏºÆµ¢Åª¤Ë¤Ï¹Ô¤ï¤ì¤Ê¤¤¤¬¡¢ -r ¤Þ¤¿¤Ï --recursive ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ì¤ÐºÆµ¢Åª¤Ë¤Ê¤ë¡£ diff ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤ÎÆâÍƤ½¤Î¤â¤Î¤ò¥Õ¥¡¥¤¥ë¤Î¤è¤¦¤ËÈæ³Ó¤¹¤ë¤³¤È¤Ï¤·¤Ê¤¤¡£ ¥Õ¥ë¥Ñ¥¹»ØÄê¤Î¥Õ¥¡¥¤¥ë¤Ï `-' ¤Ç¤¢¤Ã¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£¤Ê¤¼¤Ê¤éɸ½àÆþÎϤˤÏ̾Á°¤¬¤Ê¤¤¤Î¤Ç¡¢ ¡ÖƱ̾¤Î¥Õ¥¡¥¤¥ë¡×¤È¤¤¤¦³µÇ°¤¬»È¤¨¤Ê¤¤¤«¤é¤Ç¤¢¤ë¡£

--from-file=FILE ¥ª¥×¥·¥ç¥ó¤¬Í¿¤¨¤é¤ì¤ë¤È¡¢Ç¤°Õ¤Î¿ô¤Î¥Õ¥¡¥¤¥ë̾¤òÍ¿¤¨¤ë¤³¤È¤¬¤Ç¤­¡¢ ¤½¤ì¤¾¤ì¤Î¥Õ¥¡¥¤¥ë¤Ï FILE ¤ÈÈæ³Ó¤µ¤ì¤ë¡£ ƱÍͤˡ¢ --to-file=FILE ¥ª¥×¥·¥ç¥ó¤¬Í¿¤¨¤é¤ì¤ë¤È¡¢¤½¤ì¤¾¤ì»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ï FILE ¤ÈÈæ³Ó¤µ¤ì¤ë¡£ [ÌõÃí: 2.7 ¤Ë¤Ï¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Ï¸ºß¤·¤Ê¤¤]  

¥ª¥×¥·¥ç¥ó

-LINES

°Û¤Ê¤Ã¤Æ¤¤¤ëÉôʬ¤ÎÁ°¸å LINES ¹Ô (À°¿ô) ʬ¤Î¥³¥ó¥Æ¥¯¥¹¥È¤òɽ¼¨¤¹¤ë¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï½ÐÎÏ·Á¼°¼«ÂΤλØÄê¤Ï¹Ô¤ï¤Ê¤¤¡£ ¤·¤¿¤¬¤Ã¤Æ -c ¤ä -u ¥ª¥×¥·¥ç¥ó¤È°ì½ï¤ËÍѤ¤¤ë¤È¡¢¤Ê¤ó¤Î¸ú²Ì¤â»ý¤¿¤Ê¤¤¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï obsolete ¤Ç¤¢¤ë¡£ patch(1) ¤¬Àµ¤·¤¯Æ°ºî¤¹¤ë¤Ë¤Ï¡¢¾¯¤Ê¤¯¤È¤â 2 ¹Ô¤Î¥³¥ó¥Æ¥¯¥¹¥È¤¬É¬ÍפǤ¢¤ë¡£

-a, --text

¥Õ¥¡¥¤¥ë¤¬¥Æ¥­¥¹¥È¤Ë¤Ï¸«¤¨¤Ê¤¤¤è¤¦¤Ê¾ì¹ç¤Ç¤â¡¢ Á´¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò¥Æ¥­¥¹¥È¤È¤ß¤Ê¤·¤Æ 1 ¹Ô¤º¤ÄÈæ³Ó¤ò¹Ô¤¦¡£

-b, --ignore-space-change

¶õÇò¤Î¿ô¤À¤±¤¬°ã¤¦¾ì¹ç¤Ë¤Ï°ã¤¤¤ò̵»ë¤¹¤ë¡£

-c

context ½ÐÎÏ·Á¼°¤òÍѤ¤¤ë¡£

-d, --minimal

¥¢¥ë¥´¥ê¥º¥à¤òÊѹ¹¤·¡¢¤è¤ê¾®¤µ¤Êº¹Ê¬¤¬À¸À®¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë¡£ ¤³¤ì¤ò»È¤¦¤È diff ¤ÏÃÙ¤¯¤Ê¤ë (Èó¾ï¤ËÃÙ¤¯¤Ê¤ë¾ì¹ç¤â¤¢¤ë)¡£

-e, --ed

ed(1) ¤Î¥¹¥¯¥ê¥×¥È·Á¼°¤Ç½ÐÎϤ¹¤ë¡£

-f, --forward-ed

ed ¤Î¥¹¥¯¥ê¥×¥È¤È°ì¸«Æ±¤¸¤è¤¦¤Ê½ÐÎϤò¤¹¤ë¡£ ¤·¤«¤·½ÐÎϤ˸½¤ì¤ë½ç½ø¤¬°Û¤Ê¤ë [ÌõÃí: ¤·¤¿¤¬¤Ã¤Æ ed ¤Ç¤Ï»È¤¨¤Ê¤¤]¡£

-h

¸½ºß¤Ï²¿¤â¸ú²Ì¤ò»ý¤¿¤Ê¤¤¡£ Unix ¤È¤Î¸ß´¹À­¤Î¤¿¤á¤Ë¸ºß¤·¤Æ¤¤¤ë¡£

-i, --ignore-case

±ÑÂçʸ»ú¤È¾®Ê¸»ú¤Î°ã¤¤¤ò̵»ë¤¹¤ë¡£

-l, --paginate

½ÐÎϤò pr(1) ¤ËÄ̤·¤Æ¥Ú¡¼¥¸ÉÕ¤±¤ò¹Ô¤¦¡£

-n, --rcs

RCS ·Á¼°¤Î diff ¤ò½ÐÎϤ¹¤ë¡£ -f ¤È»÷¤Æ¤¤¤ë¤¬¡¢¤½¤ì¤¾¤ì¤Î¥³¥Þ¥ó¥É¤Ï½èÍý¤¹¤ë¹Ô¿ô¤ò»ØÄꤹ¤ë¡£

-p, --show-c-function

Êѹ¹¤¬¤É¤Î C ´Ø¿ô¤Ç¹Ô¤ï¤ì¤¿¤Î¤«¤òɽ¼¨¤¹¤ë¡£ `-F'^[_a-zA-Z$]'' ¤ÈƱ¤¸¡£

-q, --brief

¥Õ¥¡¥¤¥ë¤¬°ã¤¦¤«¤É¤¦¤«¤À¤±¤òÊó¹ð¤¹¤ë¡£ °ã¤¤¤Î¾ÜºÙ¤ÏÊó¹ð¤·¤Ê¤¤¡£

-r, --recursive

¥Ç¥£¥ì¥¯¥È¥ê¤òÈæ³Ó¤¹¤ë¤È¤­¡¢ ¸«ÉÕ¤«¤Ã¤¿¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò¤¹¤Ù¤ÆºÆµ¢Åª¤ËÈæ³Ó¤¹¤ë¡£

-s, --report-identical-files

2¤Ä¤Î¥Õ¥¡¥¤¥ë¤¬Æ±¤¸¤À¤Ã¤¿¤È¤­¤âÊó¹ð¤¹¤ë¡£

-t, --expand-tabs

ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ç¤Î¥¿¥Ö¤Ë¤è¤ë°ÌÃÖ¤¢¤ï¤»¤òÊݸ¤¹¤ë¤¿¤á¡¢ ½ÐÎϤΥ¿¥Ö¤ò¥¹¥Ú¡¼¥¹¤ËŸ³«¤¹¤ë¡£

-u

unified ½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È¤òÍѤ¤¤ë¡£

-w, --ignore-all-space

¹Ô¤òÈæ³Ó¤¹¤ë¤È¤­¶õÇò¤ò̵»ë¤¹¤ë¡£

-x PATTERN, --exclude=PATTERN

¥Ç¥£¥ì¥¯¥È¥ê¤òÈæ³Ó¤¹¤ë¤È¤­¡¢ ¥Õ¥¡¥¤¥ë̾¤Î base Éô¤¬ PATTERN ¤Ë¥Þ¥Ã¥Á¤¹¤ë¥Õ¥¡¥¤¥ë¤ä¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò̵»ë¤¹¤ë¡£

-y, --side-by-side

side-by-side ½ÐÎÏ·Á¼°¤òÍѤ¤¤ë¡£

-B, --ignore-blank-lines

¶õ¹Ô¤òÁÞÆþ¡¦ºï½ü¤¹¤ë¤À¤±¤ÎÊѹ¹¤ò̵»ë¤¹¤ë¡£

-C LINES, --context[=LINES]

context ½ÐÎÏ·Á¼°¤òÍѤ¤¡¢ LINES ¹Ô (À°¿ôÃÍ) ¤Î¥³¥ó¥Æ¥¯¥¹¥È¤òɽ¼¨¤¹¤ë¡£ LINES ¤¬Í¿¤¨¤é¤ì¤Ê¤±¤ì¤Ð 3 ¹Ôɽ¼¨¤¹¤ë¡£ patch ¤¬Àµ¤·¤¯Æ°ºî¤¹¤ë¤¿¤á¤Ë¤Ï¡¢ ¾¯¤Ê¤¯¤È¤â 2 ¹Ô¤Î¥³¥ó¥Æ¥¯¥¹¥È¤¬É¬ÍפǤ¢¤ë¤³¤È¤¬Â¿¤¤¡£

-D NAME, --ifdef=NAME

if-then-else ·Á¼°¤Ç¥Þ¡¼¥¸¤µ¤ì¤¿½ÐÎϤò¹Ô¤¤¡¢ ¥×¥ê¥×¥í¥»¥Ã¥µ¤Î¾ò·ï¥Þ¥¯¥í¤Ë NAME ¤òÍѤ¤¤ë¡£

-F REGEXP, --show-function-line=REGEXP

context ·Á¼°¤È unified ·Á¼°¤Ë¤ª¤¤¤Æ¡¢ ³Æº¹Ê¬ hunk (¥Æ¥­¥¹¥È¥Ö¥í¥Ã¥¯) ¤ËÂФ·¡¢ ¤½¤ÎÁ°Êý¤Ç REGEXP ¤Ë¥Þ¥Ã¥Á¤·¤¿ºÇ¸å¤Î¹Ô¤Î°ìÉô¤òɽ¼¨¤¹¤ë¡£

-H, --speed-large-files

¾®¤µ¤ÊÊѹ¹¤¬ÂçÎ̤ˤ¢¤ë¤è¤¦¤ÊÂ礭¤Ê¥Õ¥¡¥¤¥ë¤ò¹â®¤Ë°·¤¦¤¿¤á¤Ë¡¢ ¥Ò¥å¡¼¥ê¥¹¥Æ¥£¥Ã¥¯¤Ê¼êË¡¤òÍѤ¤¤ë¡£

-I REGEXP, --ignore-matching-lines=REGEXP

REGEXP ¤Ë¥Þ¥Ã¥Á¤¹¤ë¤è¤¦¤Ê¹Ô¤òÁÞÆþ¡¦ºï½ü¤¹¤ë¤À¤±¤ÎÊѹ¹¤ò̵»ë¤¹¤ë¡£

-L LABEL, --label=LABEL

context ·Á¼°¤È unified ·Á¼°¤Î¥Ø¥Ã¥À¤Ë¡¢ ¥Õ¥¡¥¤¥ë̾¤Ç¤Ï¤Ê¤¯ LABEL ¤òÍѤ¤¤ë¡£

-N, --new-file

¥Ç¥£¥ì¥¯¥È¥ê¤òÈæ³Ó¤¹¤ëºÝ¡¢ ÊÒÊý¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Î¤ß¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Æ¤¤¤¿¤é¡¢ ¤â¤¦ÊÒÊý¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤ÏƱ̾¤Î¶õ¤Ã¤Ý¤Î¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¤è¤¦¤ËÆ°ºî¤¹¤ë¡£

-P, --unidirectional-new-file

¥Ç¥£¥ì¥¯¥È¥ê¤òÈæ³Ó¤¹¤ëºÝ¡¢ 2 ÈÖÌܤΥǥ£¥ì¥¯¥È¥ê¤Ë¤Î¤ß¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Æ¤¤¤¿¤é¡¢ 1 ÈÖÌܤΥǥ£¥ì¥¯¥È¥ê¤Ë¤ÏƱ̾¤Î¶õ¤Ã¤Ý¤Î¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¤è¤¦¤ËÆ°ºî¤¹¤ë¡£

-S FILE, --starting-file=FILE

¥Ç¥£¥ì¥¯¥È¥ê¤òÈæ³Ó¤¹¤ëºÝ¡¢ FILE ¤«¤é»Ï¤á¤ë¡£ÃæÃǤ·¤¿Èæ³Ó¤ò³¹Ô¤¹¤ëºÝ¤ËÍøÍѤǤ­¤ë¡£

-T, --initial-tab

normal ·Á¼°¤ä context ·Á¼°¤Ç¡¢¥Æ¥­¥¹¥È¤ÎÁ°¤Ë¶õÇò¤Ç¤Ê¤¯¥¿¥Ö¤ò½ÐÎϤ¹¤ë¡£ ¤³¤¦¤¹¤ë¤È¹ÔÃæ¤Ç¤Î¥¿¥Ö¤Ë¤è¤ë·å·¤¨¤¬ÉáÄ̤˸«¤¨¤ë¡£

-U LINES, --unified[=LINES]

unified ½ÐÎÏ·Á¼°¤òÍѤ¤¡¢ LINES ¹Ô (À°¿ôÃÍ) ¤Î¥³¥ó¥Æ¥¯¥¹¥È¤òɽ¼¨¤¹¤ë¡£ LINES ¤¬Í¿¤¨¤é¤ì¤Ê¤±¤ì¤Ð 3 ¹Ôɽ¼¨¤¹¤ë¡£ patch ¤¬Àµ¤·¤¯Æ°ºî¤¹¤ë¤¿¤á¤Ë¤Ï¡¢ ¾¯¤Ê¤¯¤È¤â 2 ¹Ô¤Î¥³¥ó¥Æ¥¯¥¹¥È¤¬É¬ÍפǤ¢¤ë¤³¤È¤¬Â¿¤¤¡£

-W COLUMNS, --width=COLUMNS

side-by-side ·Á¼°¤Ç¡¢½ÐÎϤÎÉý¤ò COLUMNS ¤Ë¤¹¤ë¡£

-XFILE, --exclude-from=FILE

¥Ç¥£¥ì¥¯¥È¥ê¤òÈæ³Ó¤¹¤ëºÝ¡¢ ¥Õ¥¡¥¤¥ë̾¤Î base Éô¤¬ FILE ¤Î¥Ñ¥¿¡¼¥ó¤Î¤¤¤º¤ì¤«¤Ë¥Þ¥Ã¥Á¤¹¤ë¥Õ¥¡¥¤¥ë¤ä¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò̵»ë¤¹¤ë¡£

--binary

¥Ç¡¼¥¿¤ò¥Ð¥¤¥Ê¥ê¥â¡¼¥É¤ÇÆɤ߽ñ¤­¤¹¤ë (Linux ¤Ç¤Ï°ÕÌ£¤Ê¤·)¡£

--changed-group-format=FORMAT

if-then-else ·Á¼°¤Ç¡¢ ξÊý¤Î¥Õ¥¡¥¤¥ë¤Ç°Û¤Ê¤ë¹Ô¥°¥ë¡¼¥×¤Î½ÐÎÏ¤Ë FORMAT ¤òÍѤ¤¤ë¡£

--from-file=FILE

FILE ¤ò³Æ¥ª¥Ú¥é¥ó¥É¤ÈÈæ³Ó¤¹¤ë (FILE ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤âÎɤ¤)¡£ [ÌõÃí: 2.7 ¤Ë¤Ï¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¸ºß¤·¤Ê¤¤]

--horizon-lines=LINES

º¹Ê¬¤ò¤â¤Ã¤È¤â¥³¥ó¥Ñ¥¯¥È¤Ë½ÐÎϤ¹¤ë¤¿¤á¤Ë¡¢ °ã¤¦Éôʬ¤ÎÁ°¸å¤Ë¤¢¤ë¶¦ÄÌÉôʬ¤Î¤½¤ì¤¾¤ì LINES ¹Ô¤ò¼Î¤Æ¤º¤ËÊݸ¤¹¤ë¡£

--inhibit-hunk-merge

ÎÙÀܤ¹¤ë hunk ¤Î¶­³¦¤ò°ÜÆ°¤·¤Æ hunk ¤ò¥Þ¡¼¥¸¤¹¤ëÆ°ºî¤ò¹Ô¤ï¤Ê¤¤¡£

--left-column

side-by-side ·Á¼°¤Ç¡¢¶¦Ä̤ʹԤϺ¸Â¦¤ÎÎó¤Ë¤·¤«É½¼¨¤·¤Ê¤¤¡£

--line-format=FORMAT

if-then-else ·Á¼°¤Ç¡¢Á´¤Æ¤ÎÆþÎϹԤνÐÎÏ¤Ë FORMAT ¤òÍѤ¤¤ë¡£

--new-group-format=FORMAT

if-then-else ·Á¼°¤Ç¡¢ 2 ÈÖÌܤΥե¡¥¤¥ë¤À¤±¤Ë¤¢¤ë¹Ô¥°¥ë¡¼¥×¤Î½ÐÎÏ¤Ë FORMAT ¤òÍѤ¤¤ë¡£

--new-line-format=FORMAT

if-then-else ·Á¼°¤Ç¡¢ 2 ÈÖÌܤΥե¡¥¤¥ë¤À¤±¤Ë¤¢¤ë¹Ô¤Î½ÐÎÏ¤Ë FORMAT ¤òÍѤ¤¤ë¡£

--old-group-format=FORMAT

if-then-else ·Á¼°¤Ç¡¢ 1 ÈÖÌܤΥե¡¥¤¥ë¤À¤±¤Ë¤¢¤ë¹Ô¥°¥ë¡¼¥×¤Î½ÐÎÏ¤Ë FORMAT ¤òÍѤ¤¤ë¡£

--old-line-format=FORMAT

if-then-else ·Á¼°¤Ç¡¢ 1 ÈÖÌܤΥե¡¥¤¥ë¤À¤±¤Ë¤¢¤ë¹Ô¤Î½ÐÎÏ¤Ë FORMAT ¤òÍѤ¤¤ë¡£

--sdiff-merge-assist

sdiff(1) ÍѤËÄɲþðÊó¤òɽ¼¨¤¹¤ë¡£ sdiff ¤¬ diff ¤ò¼Â¹Ô¤¹¤ë¤È¤­¤Ë¤³¤Î¥ª¥×¥·¥ç¥ó¤òÍѤ¤¤ë¡£ Ä̾ï¤Î¥æ¡¼¥¶¡¼¤¬¤³¤Î¥ª¥×¥·¥ç¥ó¤òľÀÜ»ØÄꤹ¤ë¾ì¹ç¤Ï¤¢¤Þ¤êÁÛÄꤵ¤ì¤Æ¤¤¤Ê¤¤¡£

--suppress-common-lines

side-by-side ·Á¼°¤Ç¶¦Ä̤ʹԤòɽ¼¨¤·¤Ê¤¤¡£

--unchanged-group-format=FORMAT

if-then-else ·Á¼°¤Ç¡¢ ξÊý¤Î¥Õ¥¡¥¤¥ë¤Ë¶¦Ä̤ʹԥ°¥ë¡¼¥×¤Î½ÐÎÏ¤Ë FORMAT ¤òÍѤ¤¤ë¡£

--unchanged-line-format=FORMAT

if-then-else ·Á¼°¤Ç¡¢ ξÊý¤Î¥Õ¥¡¥¤¥ë¤Ë¶¦Ä̤ʹԤνÐÎÏ¤Ë FORMAT ¤òÍѤ¤¤ë¡£

--help

ɸ½à½ÐÎϤ˻ÈÍÑÊýË¡¤Î¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤ÆÀµ¾ï½ªÎ»¤¹¤ë¡£

-v, --version

diff ¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ò½ÐÎϤ¹¤ë¡£

½ÐÎϤηÁ¼°

context ·Á¼°

*** FROMFILE FROMFILE-MODIFICATION-TIME
--- TOFILE TOFILE-MODIFICATION-TIME

-L LABEL ¤òÍѤ¤¤ë¤È¥Ø¥Ã¥À¤ÎÆâÍƤÏÊѲ½¤¹¤ë¡£ ¼¡¤ËÍè¤ë¤Î¤Ï hunk (¥Æ¥­¥¹¥È¥Ö¥í¥Ã¥¯) ¤Ç¤¢¤ë¡£ ·«¤êÊÖ¤·Åо줹¤ë¤³¤È¤â¤¢¤ë¡£ context ·Á¼°¤Î hunk ¤Ï°Ê²¼¤Î¤è¤¦¤Ê¤â¤Î¤Ç¤¢¤ë:

***************
*** FROMFILE-LINE-RANGE ****
  FROMFILE-LINE
  FROMFILE-LINE...
--- TOFILE-LINE-RANGE ----
  TOFILE-LINE
  TOFILE-LINE...

°Û¤Ê¤Ã¤Æ¤¤¤ë¹Ô¤Î¼þÊդΥ³¥ó¥Æ¥¯¥¹¥È¤Î³Æ¹Ô¤Ë¤Ï¡¢ ÀèƬ¤Ë 2 ¤Ä¤Î¥¹¥Ú¡¼¥¹¤¬¤Ä¤¤¤Æ¤¤¤ë¡£ 2 ¤Ä¤Î¥Õ¥¡¥¤¥ë´Ö¤Ç°Û¤Ê¤Ã¤Æ¤¤¤ë¹Ô¤Ë¤Ï¡¢ ÀèƬ¤Ëɽ¼¨Ê¸»ú¤È¥¹¥Ú¡¼¥¹¤¬¤Ä¤¯¡£

!

2 ¤Ä¤Î¥Õ¥¡¥¤¥ë´Ö¤ÇÊѹ¹¤µ¤ì¤¿Éôʬ¤Î³Æ¹Ô¡£ ¤â¤¦°ìÊý¤Î¥Õ¥¡¥¤¥ë¤ÎÂбþ¤¹¤ëÉôʬ¤â `!' ¤Ç¥Þ¡¼¥¯¤µ¤ì¤Æɽ¼¨¤µ¤ì¤ë¡£

+

2 ¤Ä¤á¤Î¥Õ¥¡¥¤¥ë¤Ç¡ÖÁÞÆþ¤µ¤ì¤¿¡×¹Ô¡£ 1 ¤Ä¤á¤Î¥Õ¥¡¥¤¥ë¤ËÂбþÉôʬ¤Ï¤Ê¤¤¡£

-

1 ¤Ä¤á¤Î¥Õ¥¡¥¤¥ë¤Ç¡Öºï½ü¤µ¤ì¤¿¡×¹Ô¡£ 2 ¤Ä¤á¤Î¥Õ¥¡¥¤¥ë¤ËÂбþÉôʬ¤Ï¤Ê¤¤¡£

hunk ¤ÎÁ´¤Æ¤ÎÊѹ¹¤¬ÁÞÆþ¤Ç¤¢¤ì¤Ð¡¢ FROMFILE ³Æ¹Ô¤Ï¾Êά¤µ¤ì¤ë¡£¤Þ¤¿Á´¤Æ¤ÎÊѹ¹¤¬ºï½ü¤Ç¤¢¤ì¤Ð¡¢ TOFILE ³Æ¹Ô¤Ï¾Êά¤µ¤ì¤ë¡£  

unified ·Á¼°

--- FROMFILE FROMFILE-MODIFICATION-TIME
+++ TOFILE TOFILE-MODIFICATION-TIME

-L LABEL ¤òÍѤ¤¤ë¤È¥Ø¥Ã¥À¤ÎÆâÍƤÏÊѲ½¤¹¤ë¡£ ¼¡¤ËÍè¤ë¤Î¤Ï hunk (¥Æ¥­¥¹¥È¥Ö¥í¥Ã¥¯) ¤Ç¤¢¤ë¡£·«¤êÊÖ¤·Åо줹¤ë¤³¤È¤â¤¢¤ë¡£ ¤½¤ì¤¾¤ì¤Î hunk ¤Ï¥Õ¥¡¥¤¥ë¤Î°Û¤Ê¤Ã¤Æ¤¤¤ë°ì¤Ä°ì¤Ä¤ÎÉôʬ¤ò¼¨¤·¤Æ¤¤¤ë¡£ unified ·Á¼°¤Î hunk ¤Ï°Ê²¼¤Î¤è¤¦¤Ê¤â¤Î¤Ç¤¢¤ë:

@@ FROMFILE-RANGE TOFILE-RANGE @@
LINE-FROM-EITHER-FILE
LINE-FROM-EITHER-FILE...

ξ¼Ô¤Ç¶¦Ä̤ʹԤÎÁ°¤Ë¤Ï 1 ¤Ä¤Î¥¹¥Ú¡¼¥¹¤¬ÃÖ¤«¤ì¤ë¡£ °Û¤Ê¤ë¹Ô¤ÎÁ°¤Ë¤Ï°Ê²¼¤Îɽ¼¨Ê¸»ú¤¬ÃÖ¤«¤ì¤ë:

+

¤³¤³¤Ç 1 ¤Ä¤á¤Î¥Õ¥¡¥¤¥ë¤Ë¹Ô¤ÎÄɲ䬹Ԥï¤ì¤¿¡£

-

¤³¤³¤Ç 1 ¤Ä¤á¤Î¥Õ¥¡¥¤¥ë¤«¤é¹Ô¤Îºï½ü¤¬¹Ô¤ï¤ì¤¿¡£

side-by-side ·Á¼°

` '

Âбþ¤¹¤ë¹Ô¤¬¶¦Ä̤Ǥ¢¤ë¡£¤Ä¤Þ¤ê¡¢Î¾Êý¤Î¹Ô¤¬Æ±°ì¤Ç¤¢¤ë¤«¡¢ °ã¤¤¤¬ --ignore ¥ª¥×¥·¥ç¥ó¤Î¤¤¤º¤ì¤«¤Ë¤è¤Ã¤Æ̵»ë¤µ¤ì¤¿¡£

|

Âбþ¤¹¤ë¹Ô¤¬°Û¤Ê¤ë¡£Î¾Êý¤È¤â´°Á´¤«¡¢Î¾Êý¤È¤âÉÔ´°Á´¤«¤Ç¤¢¤ë¡£

<

¥Õ¥¡¥¤¥ë¤Ï°Û¤Ê¤ê¡¢ 1 ÈÖÌܤΥե¡¥¤¥ë¤Ë¤À¤±¤³¤Î¹Ô¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¡£

>

¥Õ¥¡¥¤¥ë¤Ï°Û¤Ê¤ê¡¢ 2 ÈÖÌܤΥե¡¥¤¥ë¤Ë¤À¤±¤³¤Î¹Ô¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¡£

(

1 ÈÖÌܤΥե¡¥¤¥ë¤Ë¤À¤±¤³¤Î¹Ô¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¤¬¡¢°ã¤¤¤Ï̵»ë¤µ¤ì¤ë¡£

)

2 ÈÖÌܤΥե¡¥¤¥ë¤Ë¤À¤±¤³¤Î¹Ô¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¤¬¡¢°ã¤¤¤Ï̵»ë¤µ¤ì¤ë¡£

\

Âбþ¤¹¤ë¹Ô¤¬°Û¤Ê¤ë¡£ 1 ÈÖÌܤιԤÀ¤±¤Ë¹ÔËö¤Î²þ¹Ô¤¬¤Ê¤¤¡£

/

Âбþ¤¹¤ë¹Ô¤¬°Û¤Ê¤ë¡£ 2 ÈÖÌܤιԤÀ¤±¤Ë¹ÔËö¤Î²þ¹Ô¤¬¤Ê¤¤¡£ Ä̾ï½ÐÎϹԤϡ¢¤½¤³¤Ë´Þ¤Þ¤ì¤ë¹Ô¤ÎËöÈø¤Ë²þ¹Ô¤¬¤Ê¤¤¾ì¹ç¤Ë¸Â¤Ã¤Æ²þ¹Ô¤µ¤ì¤Ê¤¤¡£ ¤·¤«¤·¡¢½ÐÎϹԤ¬Æó¹Ô¤Îº¹°Û¤òɽ¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢ ÊÒÊý¤À¤±¤Ë²þ¹Ô¤¬¤Ê¤¤¾ì¹ç¤â¤¢¤êÆÀ¤ë¡£¤³¤Î¾ì¹ç½ÐÎϹԤˤϲþ¹Ô¤¬½ÐÎϤµ¤ì¤ë¤¬¡¢ ¹Â¤Î¥Þ¡¼¥¯¤Ï 1 ÈÖÌܤιÔËö¤Ë²þ¹Ô¤¬¤Ê¤±¤ì¤Ð `\' ¤Ë¡¢ 2 ÈÖÌܤιÔËö¤Ë²þ¹Ô¤¬¤Ê¤±¤ì¤Ð `/' ¤Ë¤Ê¤ë¡£

side-by-side ·Á¼°¤¬°ìÈÖÆɤߤ䤹¤¤¤è¤¦¤Ê¾ì¹ç¤â¤¢¤ë¤¬¡¢¸Â³¦¤â¤¢¤ë¡£ ¤³¤Î·Á¼°¤ÏÄ̾ï¤è¤ê¤â¤º¤Ã¤È¹­¤¤Éý¤Î½ÐÎϤòÀ¸À®¤·¡¢ Ť¹¤®¤ë¹Ô¤ÏÀÞ¤ê¾ö¤ó¤Ç¤·¤Þ¤¦¡£ ¤Þ¤¿¤³¤Î½ÐÎϤǤÏÄ̾ï¤è¤ê¤âʸ»ú¤ÎÀ°Îó¤Ø¤Î°Í¸¤¬Â礭¤¯¤Ê¤ë¤Î¤Ç¡¢ ÅùÉý¥Õ¥©¥ó¥È¤ò»È¤Ã¤Æ¤¤¤Ê¤«¤Ã¤¿¤ê¡¢Ä̾ï¤È°Û¤Ê¤ë¥¿¥Ö¥¹¥È¥Ã¥×¤ò»È¤Ã¤Æ¤¤¤¿¤ê¡¢ °õ»ú¤µ¤ì¤Ê¤¤Ê¸»ú¤ò»È¤Ã¤Æ¤¤¤¿¤ê¤¹¤ë¤È¡¢½ÐÎϤ¬Èó¾ï¤Ë½¹¤¯¤Ê¤ë¡£  

ed(1) ·Á¼°

CHANGE-COMMAND
TO-FILE-LINE
TO-FILE-LINE...
.

ed ¤ÏÆþÎϤÎËöÈø¤òɽ¤¹¤¿¤á¤Ë¥Ô¥ê¥ª¥É°ì¤Ä¤À¤±¤Î¹Ô¤òÍѤ¤¤ë¤Î¤Ç¡¢ diff ¤ÏÊѹ¹¤µ¤ì¤¿¹Ô¤Î¤¦¤Á¡¢¥Ô¥ê¥ª¥É°ì¤Ä¤À¤±¤Î¹Ô¤ò ¥Ô¥ê¥ª¥ÉÆó¤Ä¤ËÊѹ¹¤·¤Æ¥×¥í¥Æ¥¯¥È¤·¡¢ ³¤±¤ÆÆó¤Ä¤Î¥Ô¥ê¥ª¥É¤ò°ì¤Ä¤Ë¤¹¤ë ed ¥³¥Þ¥ó¥É¤ò½ñ¤¯¡£ ed ·Á¼°¤Ï²þ¹Ô¤µ¤ì¤Æ¤¤¤Ê¤¤¹Ô¤òɽ¤¹¤³¤È¤¬¤Ç¤­¤Ê¤¤¡£ ¤·¤¿¤¬¤Ã¤Æ 2 ÈÖÌܤΥե¡¥¤¥ë¤ÎºÇ½ª¹Ô¤¬Êѹ¹¤µ¤ì¤Æ¤¤¤Æ¡¢ ¤«¤Ä²þ¹Ô¤µ¤ì¤Æ¤¤¤Ê¤«¤Ã¤¿¾ì¹ç¡¢ diff ¤Ï¥¨¥é¡¼¤ò¥ì¥Ý¡¼¥È¤·¤Æ¡¢²þ¹Ô¤¬¤¢¤ë¤«¤Î¤è¤¦¤ËÆ°ºî¤¹¤ë¡£

Êѹ¹¥³¥Þ¥ó¥É¤Ë¤Ï 3 ¤Ä¤Î¼ïÎब¤¢¤ë¡£ ¤½¤ì¤¾¤ì¡¢ 1 ÈÖÌܤΥե¡¥¤¥ë¤Î¹ÔÈÖ¹æ (¤Þ¤¿¤Ï¥³¥ó¥Þ¶èÀÚ¤ê»ØÄê¤Î¹ÔÈÏ°Ï»ØÄê)¡¢ ³¤±¤ÆÊѹ¹¤Î¼ïÎà¤ò¼¨¤¹ 1 ʸ»ú¤Îʸ»ú¤«¤é¤Ê¤ë¡£ ¹ÔÈÖ¹æ¤Ï¡¢¤¹¤Ù¤Æ¥Õ¥¡¥¤¥ë¤Î¥ª¥ê¥¸¥Ê¥ë¤Î¹ÔÈÖ¹æ¤Ç¤¢¤ë¡£ Êѹ¹¥³¥Þ¥ó¥É¤Î¼ïÎà¤Ï°Ê²¼¤ÎÄ̤ê:

La

1 ÈÖÌܤΥե¡¥¤¥ë¤Î L ¹ÔÌܰʹߤˡ¢2 ÈÖÌܤΥե¡¥¤¥ë¤«¤é¥Æ¥­¥¹¥È¤òÄɲ乤롣 Î㤨¤Ð `8a' ¤Ï¡¢°Ê¹ß¤Î¹Ô¤ò¥Õ¥¡¥¤¥ë 1 ¤Î 8 ¹ÔÌܰʹߤËÄɲ乤롣

Rc

1 ÈÖÌܤΥե¡¥¤¥ë¤Î¹ÔÈÏ°Ï R ¤ò¡¢ °ú¤­Â³¤¯¹Ô¤ÇÃÖ¤­´¹¤¨¤ë¡£ÄɲäȺï½ü¤ÎÁȤ߹ç¤ï¤»¤Ç¤âƱ¤¸¤³¤È¤¬¤Ç¤­¤ë¤¬¡¢ ¤³¤Á¤é¤Î¤Û¤¦¤¬¥³¥ó¥Ñ¥¯¥È¤Ç¤¢¤ë¡£Î㤨¤Ð `5,7c' ¤Ï¥Õ¥¡¥¤¥ë 1 ¤Î 5 ¹ÔÌܤ«¤é 7 ¹ÔÌܤò¥Õ¥¡¥¤¥ë 2 ¤«¤éÆɤ߹þ¤ó¤ÀÆâÍƤÇÃÖ¤­´¹¤¨¤ë¡£

Rd

1 ÈÖÌܤΥե¡¥¤¥ë¤Î¹ÔÈÏ°Ï R ¤òºï½ü¤¹¤ë¡£ Î㤨¤Ð `5,7d' ¤Ï¥Õ¥¡¥¤¥ë 1 ¤Î 5 ¹ÔÌܤ«¤é 7 ¹ÔÌܤޤǤòºï½ü¤¹¤ë¡£

diff ¤Ï ed ¥¹¥¯¥ê¥×¥È¤Î¤è¤¦¤Ê½ÐÎϤǡ¢¤«¤Ä³Æ hunk ¤¬ forward Êý¸þ (ÀèƬ¤«¤éËöÈø¤Ø) ¤Î¤è¤¦¤Ê½ÐÎϤâÀ¸À®¤Ç¤­¤ë¡£¥³¥Þ¥ó¥É¤Î·Á¼°¤â¤Á¤ç¤Ã¤ÈÊѲ½¤·¤Æ¤¤¤ë¡£ ¥³¥Þ¥ó¥Éʸ»ú¤¬¡¢½¤Àµ¤¹¤ë¹Ô¤ä¹ÔÈϰϤÎÀè¤ËÍè¤ë¤Î¤Ç¤¢¤ë¡£ ¤Þ¤¿¡¢¥Ô¥ê¥ª¥É¤Ò¤È¤Ä¤À¤±¤Î¹Ô¤òÆÃÊÌ°·¤¤¤¹¤ë¤³¤È¤â¤·¤Ê¤¤¡£ ed ·Á¼°¤ÈƱÍͤˡ¢forward ed ·Á¼°¤â²þ¹Ô¤·¤Æ¤¤¤Ê¤¤¹Ô¤òɽ¤¹¤³¤È¤Ï¤Ç¤­¤Ê¤¤¡£

forward ed ·Á¼°¤Ï¤¢¤Þ¤êÊØÍø¤Ç¤Ï¤Ê¤¤¡£¤Ê¤¼¤Ê¤é ed ¤â patch ¤â¤³¤Î·Á¼°¤Î diff ¤òÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤Ê¤¤¤«¤é¤Ç¤¢¤ë¡£ ¤³¤ì¤Ï¼ç¤Ë¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Î diff ¤È¤Î¸ß´¹À­¤Î¤¿¤á¤Ë¸ºß¤·¤Æ¤¤¤ë¡£  

RCS ·Á¼°

IF-THEN-ELSE

C ¥½¡¼¥¹·Á¼°

    do {
 #ifndef HAVE_WAITPID
          if ((w = wait (&s)) < 0 && errno != EINTR)
 #else /* HAVE_WAITPID */
          if ((w = waitpid (-1, &s, 0)) < 0  &&  errno != EINTR)
 #endif /* HAVE_WAITPID */
          return w;
    } while (w != child);

¹Ô¥°¥ë¡¼¥×·Á¼°

Î㤨¤Ð¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ï TeX ¥Õ¥¡¥¤¥ë `old' ¤È `new' ¤òÈæ³Ó¤·¡¢ old ¤ÎÉôʬ¤ò `\begin{em}'-`\end{em}' ¤Ç°Ï¤ß¡¢ new ¤ÎÉôʬ¤ò `\begin{bf}'-`\end{bf}' ¤Ç°Ï¤ó¤Ç¥Þ¡¼¥¸¤·¤¿¤«¤¿¤Á¤Ç½ÐÎϤ¹¤ë¡£

 diff \
    --old-group-format='\begin{em}
 %<\end{em}
 '  \
    --new-group-format='\begin{bf}
 %>\end{bf}
 '  \
    old new

°Ê²¼¤Î¥³¥Þ¥ó¥É¤â¾åµ­¤ÎÎã¤ÈƱ¤¸¤À¤¬¡¢¤ä¤äµ­½Ò¤¬Â¿¤¤¡£ ¥Ç¥Õ¥©¥ë¥È¤Î¹Ô¥°¥ë¡¼¥×·Á¼°¤â»ØÄꤷ¤Æ¤¤¤ë¤«¤é¤Ç¤¢¤ë¡£

 diff \
    --old-group-format='\begin{em}
 %<\end{em}
 ' \
    --new-group-format='\begin{bf}
 %>\end{bf}
 ' \
    --unchanged-group-format='%=' \
    --changed-group-format='\begin{em}
 %<\end{em}
 \begin{bf}
 %>\end{bf}
 '  \
    old new

¼¡¤Ë¤â¤¦¾¯¤·¿Ê¤ó¤ÀÎã¤ò¾Ò²ð¤¹¤ë¡£¤³¤ì¤Ïº¹Ê¬¥ê¥¹¥È¤ò¡¢
 "plain English" ¥¹¥¿¥¤¥ë¤Ç¹ÔÈÖ¹æ¤ò½ñ¤¤¤¿¥Ø¥Ã¥À¤È¤È¤â¤Ë½ÐÎϤ¹¤ë¡£

 diff \
    --unchanged-group-format='' \
    --old-group-format='-------- %dn line%(n=1?:s) deleted at %df:
 %<' \
    --new-group-format='-------- %dN line%(N=1?:s) added after %de:
 %>' \
    --changed-group-format='-------- %dn line%(n=1?:s) changed at %df:
 %<-------- to:
 %>' \
    old new

¹Ô¥°¥ë¡¼¥×·Á¼°¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢ diff ¤ò°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤Î¤É¤ì¤«¤Ò¤È¤Ä¤ò»ØÄꤷ¤Æ¼Â¹Ô¤¹¤ë¡£ 4 ¤Ä¤Þ¤Ç¤Î¹Ô¥°¥ë¡¼¥×·Á¼°¤ò»ØÄê¤Ç¤­¡¢ ³Æ»ØÄ꤬¤½¤ì¤¾¤ì¹Ô¥°¥ë¡¼¥×¤Ò¤È¤Ä¤ËÂбþ¤¹¤ë¡£ FORMAT ¤Ë¤Ï¥·¥§¥ë¤Î¥á¥¿¥­¥ã¥é¥¯¥¿¤¬Æþ¤Ã¤Æ¤¤¤ë¤³¤È¤¬Â¿¤¤¤Î¤Ç¡¢ ¥¯¥©¡¼¥È¤¹¤ë¤Ù¤­¤Ç¤¢¤í¤¦¡£

--old-group-format=FORMAT

¤³¤ì¤é¤Î¹Ô¥°¥ë¡¼¥×¤Ï 1 ÈÖÌܤΥե¡¥¤¥ë¤À¤±¤Ë¤¢¤ë¹Ô¤«¤é¤Ê¤ë hunk ¤Ç¤¢¤ë¡£ ¥Ç¥Õ¥©¥ë¥È¤Î old ¥°¥ë¡¼¥×·Á¼°¤Ï¡¢ changed ¥°¥ë¡¼¥×·Á¼°¤¬»ØÄꤵ¤ì¤Æ¤¤¤ì¤Ð ¤½¤ì¤ÈƱ¤¸¤Ë¤Ê¤ë¡£¤µ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¹Ô¥°¥ë¡¼¥×¤Ï¤½¤Î¤Þ¤Þ¤Î¤«¤¿¤Á¤Ç½ÐÎϤµ¤ì¤ë¡£

--new-group-format=FORMAT

¤³¤ì¤é¤Î¹Ô¥°¥ë¡¼¥×¤Ï 2 ÈÖÌܤΥե¡¥¤¥ë¤À¤±¤Ë¤¢¤ë¹Ô¤«¤é¤Ê¤ë hunk ¤Ç¤¢¤ë¡£ ¥Ç¥Õ¥©¥ë¥È¤Î new ¥°¥ë¡¼¥×·Á¼°¤Ï¡¢ changed ¥°¥ë¡¼¥×·Á¼°¤¬»ØÄꤵ¤ì¤Æ¤¤¤ì¤Ð ¤½¤ì¤ÈƱ¤¸¤Ë¤Ê¤ë¡£¤µ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¹Ô¥°¥ë¡¼¥×¤Ï¤½¤Î¤Þ¤Þ¤Î¤«¤¿¤Á¤Ç½ÐÎϤµ¤ì¤ë¡£

--changed-group-format=FORMAT

¤³¤ì¤é¤Î¹Ô¥°¥ë¡¼¥×¤ÏξÊý¤Î¥Õ¥¡¥¤¥ë¤Î¹Ô¤«¤é¤Ê¤ë hunk ¤Ç¤¢¤ë¡£ ¥Ç¥Õ¥©¥ë¥È¤Î changed ¥°¥ë¡¼¥×·Á¼°¤Ï¡¢ old ¥°¥ë¡¼¥×¤È new ¥°¥ë¡¼¥×¤Î·Á¼°¤òÏ¢·ë¤·¤¿¤â¤Î¤Ç¤¢¤ë¡£

--unchanged-group-format=FORMAT

¤³¤ì¤é¤Î¹Ô¥°¥ë¡¼¥×¤ÏξÊý¤Î¥Õ¥¡¥¤¥ë¤Ë¶¦Ä̤ιԤ«¤é¤Ê¤ë hunk ¤Ç¤¢¤ë¡£ ¥Ç¥Õ¥©¥ë¥È¤Î unchanged ¥°¥ë¡¼¥×·Á¼°¤Ï¡¢ ¹Ô¥°¥ë¡¼¥×¤ò¤½¤Î¤Þ¤Þ¤Î¤«¤¿¤Á¤Ç½ÐÎϤ¹¤ë¤â¤Î¤Ç¤¢¤ë¡£

¥°¥ë¡¼¥×ÊÑ´¹

%<

1 ÈÖÌܤΥե¡¥¤¥ë¤«¤é¤Î¹Ô¤ò°ÕÌ£¤¹¤ë¡£¹ÔËöÈø¤Î²þ¹Ô¤â´Þ¤à¡£ ³Æ¹Ô¤Ï old ¹Ô·Á¼°¤Ë¤è¤Ã¤ÆÀ°·Á¤µ¤ì¤ë¡£

%>

2 ÈÖÌܤΥե¡¥¤¥ë¤«¤é¤Î¹Ô¤ò°ÕÌ£¤¹¤ë¡£¹ÔËöÈø¤Î²þ¹Ô¤â´Þ¤à¡£ ³Æ¹Ô¤Ï new ¹Ô·Á¼°¤Ë¤è¤Ã¤ÆÀ°·Á¤µ¤ì¤ë¡£

%=

ξÊý¤Î¥Õ¥¡¥¤¥ë¤Ç¶¦Ä̤ʹԤò°ÕÌ£¤¹¤ë¡£¹ÔËöÈø¤Î²þ¹Ô¤â´Þ¤à¡£ ³Æ¹Ô¤Ï unchanged ¹Ô·Á¼°¤Ë¤è¤Ã¤ÆÀ°·Á¤µ¤ì¤ë¡£

%%

`%' ¤òɽ¤¹¡£

%c'C''

¤³¤³¤Ç C ¤Ïʸ»ú 1 ʸ»ú¤Ç¡¢ C ¤òɽ¤¹¡£ C ¤Ë¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤ä¥¢¥Ý¥¹¥È¥í¥Õ¥£¤Ï»ØÄê¤Ç¤­¤Ê¤¤¡£ Î㤨¤Ð `%c':'' ¤Ï¥³¥í¥ó¤òɽ¤·¡¢¤³¤ì¤Ï if-then-else ·Á¼°¤Î then Éôʬ¤Ç¤â¥³¥í¥ó¤È¤·¤Æ²ò¼á¤µ¤ì¤ë¡£Ä̾ï¤Ï¥³¥í¥ó¤Ï then Éôʬ¤Î½ª¤ï¤ê¤È¤·¤Æ°·¤ï¤ì¤ë¡£

%c'\O''

¤³¤³¤Ç 0 ¤Ï 1 ·å¤«¤é 3 ·å¤Þ¤Ç¤Î 8 ¿Ê¿ô»ú¤Ç¤¢¤ê¡¢8 ¿Ê¤Î¥³¡¼¥É 0 ¤ËÂбþ¤¹¤ëʸ»ú¤òɽ¤¹¡£Î㤨¤Ð `%c'\0'' ¤Ï¥Ê¥ëʸ»ú¤Ë¤Ê¤ë¡£

(A=B?T:E)

A ¤¬ B ¤ËÅù¤·¤¤¾ì¹ç¤Ï T¡¢ Åù¤·¤¯¤Ê¤¤¾ì¹ç¤Ï E¡£ A ¤È B ¤Ï¤½¤ì¤¾¤ì 10 ¿Ê¿ô¤ÎÄê¿ô¤«¡¢¾åµ­¤Î¤è¤¦¤Ë²ò¼á¤µ¤ì¤ëʸ»ú¤Ò¤È¤Ä¤Ç¤¢¤ë¡£ ¤³¤Î·Á¼°»ØÄê¤Ï A ¤ÎÃͤ¬ B ¤ÈÅù¤·¤±¤ì¤Ð T ¤ÈÅù²Á¤Ç¤¢¤ê¡¢ ¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï E ¤ÈÅù²Á¤Ç¤¢¤ë¡£

Î㤨¤Ð `%(N=0?no:%dN) line%(N=1?:s)' ¤Ï N (new ¥Õ¥¡¥¤¥ë¤«¤é¤Î¥°¥ë¡¼¥×¤Î¹Ô¿ô) ¤¬ 0 ¤Ê¤é `no lines' ¤È¤Ê¤ê¡¢ N ¤¬ 1 ¤Ê¤é `1 line' ¤È¤Ê¤ê¡¢¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï `%dN lines' ¤È¤Ê¤ë¡£

FN

¤³¤³¤Ç F ¤Ï printf(3) ¤ÎÊÑ´¹»ØÄê¤Ç¡¢ N ¤Ï°Ê²¼¤Îʸ»ú¤Î¤É¤ì¤«¤Ç¤¢¤ë¡£ ¡ÖF ¤ÇÀ°·Á¤µ¤ì¤¿ N ¤ÎÃÍ¡× ¤òɽ¤¹¡£

e

old ¥Õ¥¡¥¤¥ë¤«¤é¤Î¥°¥ë¡¼¥×¤ÎľÁ°¤Î¹Ô¤Î¹ÔÈֹ档

f

old ¥Õ¥¡¥¤¥ë¤«¤é¤Î¥°¥ë¡¼¥×¤ÎºÇ½é¤Î¹ÔÈֹ档 e + 1 ¤ËÅù¤·¤¤¡£

l

old ¥Õ¥¡¥¤¥ë¤«¤é¤Î¥°¥ë¡¼¥×¤ÎËöÈø¤Î¹ÔÈֹ档

m

old ¥Õ¥¡¥¤¥ë¤«¤é¤Î¥°¥ë¡¼¥×¤Îľ¸å¤Î¹Ô¤Î¹ÔÈֹ档 l + 1 ¤ËÅù¤·¤¤¡£

n

old ¥Õ¥¡¥¤¥ë¤«¤é¤Î¥°¥ë¡¼¥×¤Î¹Ô¿ô¡£ l - f + 1 ¤ËÅù¤·¤¤¡£

E, F, L, M, N

¾åµ­¤ÈƱÍͤΠnew ¥Õ¥¡¥¤¥ë¤«¤é¤Î¥°¥ë¡¼¥×¤Î¤â¤Î¡£

printf ÊÑ´¹»ØÄê¤Ë¤Ï %d, %o, %x, %X (¤½¤ì¤¾¤ì 10 ¿Ê, 8 ¿Ê, ¾®Ê¸»ú 16 ¿Ê, Âçʸ»ú 16 ¿Ê) ¤¬»È¤¨¤ë¡£ `%' ¤Î¸å¤Ë¤Ï°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤ò½ç¤Ë»ØÄê¤Ç¤­¤ë¡£ `-' (º¸µÍ¤á¤Î»ØÄê)¡¢À°¿ô (¥Õ¥£¡¼¥ë¥É¤ÎºÇÄãÉý)¡¢ ¥Ô¥ê¥ª¥É¤È¿ôÃÍ (¿ôÃͤϾÊά²Ä; ·å¿ô¤ÎºÇ¾®ÃÍ) ¤Ç¤¢¤ë¡£ Î㤨¤Ð `%5dN' ¤Ï new ¥Õ¥¡¥¤¥ë¤«¤é¤Î¥°¥ë¡¼¥×¤Î¹Ô¿ô¤ò¡¢ 5 ʸ»úÉý¤Î¥Õ¥£¡¼¥ë¥É¤Ë¡¢ printf ¤Î "%5d" ½ñ¼°¤òÍѤ¤¤Æɽ¼¨¤¹¤ë¡£

¹Ô·Á¼°

¹Ô·Á¼°¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤Î¤É¤ì¤«¤òÍѤ¤¤ë¡£ FORMAT ¤Ë¤Ï¥·¥§¥ë¤Î¥á¥¿¥­¥ã¥é¥¯¥¿¤¬Æþ¤Ã¤Æ¤¤¤ë¤³¤È¤¬Â¿¤¤¤Î¤Ç¡¢ ¥¯¥©¡¼¥È¤¹¤ë¤Ù¤­¤Ç¤¢¤í¤¦¡£

--old-line-format=FORMAT

1 ÈÖÌܤΥե¡¥¤¥ë¤«¤é¤Î¹Ô¤À¤±¤òÀ°·Á¤¹¤ë¡£

--new-line-format=FORMAT

2 ÈÖÌܤΥե¡¥¤¥ë¤«¤é¤Î¹Ô¤À¤±¤òÀ°·Á¤¹¤ë¡£

--unchanged-line-format=FORMAT

ξÊý¤Î¥Õ¥¡¥¤¥ë¤Ë¶¦Ä̤ιԤòÀ°·Á¤¹¤ë¡£

--line-format=FORMAT

Á´¤Æ¤Î¹Ô¤òÀ°·Á¤¹¤ë¡£¾åµ­¤ÎÁ´¤Æ¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¤ËÅù¤·¤¤¡£

¹Ô·Á¼°¤Ç¤Ï¡¢ÉáÄ̤Îʸ»ú¤Ï¤½¤ì¼«¿È¤òɽ¤¹¡£ÊÑ´¹»ØÄê¤Ï `%' ¤Ç»Ï¤Þ¤ê¡¢°Ê²¼¤Î·Á¼°¤ò¤È¤ë:

%l

¹Ô¤ÎÆâÍƤò°ÕÌ£¤¹¤ë¡£¹ÔËöÈø¤Î²þ¹Ô¤Ï¤¢¤Ã¤Æ¤â´Þ¤Þ¤Ê¤¤¡£ ¤³¤Î·Á¼°¤Ç¤Ï¡¢¹Ô¤Ë²þ¹Ô¤¬¤¢¤ë¤«¤É¤¦¤«¤Ï̵»ë¤µ¤ì¤ë¡£

%L

¹Ô¤ÎÆâÍƤò°ÕÌ£¤¹¤ë¡£¹ÔËöÈø¤Î²þ¹Ô¤¬¤¢¤ì¤Ð¤½¤ì¤â´Þ¤à¡£ ¹Ô¤Ë²þ¹Ô¤¬Ìµ¤±¤ì¤Ð¡¢²þ¹Ô¤Ï̵¤¤¤Þ¤Þ¤Ë¤Ê¤ë¡£

%%

`%' ¤òɽ¤¹¡£

%c'C''

¤³¤³¤Ç C ¤Ïʸ»ú 1 ʸ»ú¤Ç¡¢ C ¤òɽ¤¹¡£ C ¤Ë¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤ä¥¢¥Ý¥¹¥È¥í¥Õ¥£¤Ï»ØÄê¤Ç¤­¤Ê¤¤¡£ Î㤨¤Ð `%c':'' ¤Ï¥³¥í¥ó¤òɽ¤·¡¢¤³¤ì¤Ï if-then-else ·Á¼°¤Î then Éôʬ¤Ç¤â¥³¥í¥ó¤È¤·¤Æ²ò¼á¤µ¤ì¤ë¡£Ä̾ï¤Ï¥³¥í¥ó¤Ï then Éôʬ¤Î½ª¤ï¤ê¤È¤·¤Æ°·¤ï¤ì¤ë¡£

%c'\O''

¤³¤³¤Ç 0 ¤Ï 1 ·å¤«¤é 3 ·å¤Þ¤Ç¤Î 8 ¿Ê¿ô»ú¤Ç¤¢¤ê¡¢8 ¿Ê¤Î¥³¡¼¥É 0 ¤ËÂбþ¤¹¤ëʸ»ú¤òɽ¤¹¡£Î㤨¤Ð `%c'\0'' ¤Ï¥Ê¥ëʸ»ú¤Ë¤Ê¤ë¡£

Fn

¤³¤³¤Ç F ¤Ï printf(3) ¤ÎÊÑ´¹»ØÄê¤Ç¡¢ F ¤Ë¤è¤êÀ°·Á¤µ¤ì¤¿¹ÔÈÖ¹æ¤òɽ¤¹¡£ Î㤨¤Ð `%.5dN' ¤Ï¹ÔÈÖ¹æ¤ò¥Õ¥©¡¼¥Þ¥Ã¥È `%.5d' ¤ÇÀ°·Á¤·¤Æɽ¼¨¤¹¤ë¡£ printf ÊÑ´¹»ØÄê¤Î¾ÜºÙ¤Ï¡¢¾åµ­¤Î¹Ô¥°¥ë¡¼¥×·Á¼°¤Î¥µ¥Ö¥»¥¯¥·¥ç¥ó¤ò¸«¤è¡£

¥Ç¥Õ¥©¥ë¥È¤Î¹Ô·¼¼°¤Ï `%l' ¤Ë²þ¹Ôʸ»ú¤ò³¤±¤¿¤â¤Î¤Ç¤¢¤ë¡£ÆþÎϤ˥¿¥Öʸ»ú¤¬¤¢¤ê¡¢ ¤½¤ì¤¬½ÐÎϹԤηå·¤¨¤Ë½ÅÍפǤ¢¤ë¾ì¹ç¤Ë¤Ï¡¢ `%l' ¤ä `%L' ¤Î¹Ô»ØÄê¤ò ¥¿¥Ö¥¹¥È¥Ã¥×¤Îľ¸å¤ËÃÖ¤¯¤È¤è¤¤ (¤¹¤Ê¤ï¤Á `%l' ¤ä `%L' ¤ÎÁ°¤Ë¥¿¥Öʸ»ú¤òÃÖ¤±¤Ð¤è¤¤)¡£ ¤¢¤ë¤¤¤Ï -t ¥ª¥×¥·¥ç¥ó¤òÍѤ¤¤ë¤Î¤â¤è¤¤¤À¤í¤¦¡£

¹Ô·Á¼°¤È¹Ô¥°¥ë¡¼¥×·Á¼°¤òƱ»þ¤ËÍѤ¤¤ë¤È¡¢ÍÍ¡¹¤Ê·Á¼°»ØÄ꤬²Äǽ¤È¤Ê¤ë¡£ Î㤨¤Ð¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ï diff ¤ÎÄ̾ï¤Î·Á¼°¤È»÷¤¿·Á¼°¤Î»ØÄê¤Ç¤¢¤ë¡£ ¤³¤ì¤ò½¤Àµ¤¹¤ì¤Ð¡¢ diff ¤Î½ÐÎϤòÈùÄ´À°¤¹¤ë¤³¤È¤¬²Äǽ¤Ë¤Ê¤ë¡£

 diff \
    --old-line-format='< %l
 ' \
    --new-line-format='> %l
 ' \
    --old-group-format='%df%(f=l?:,%dl)d%dE
 %<' \
    --new-group-format='%dea%dF%(F=L?:,%dL)
 %>' \
    --changed-group-format='%df%(f=l?:,%dl)c%dF%(F=L?:,%dL)
 %<---
 %>' \
    --unchanged-group-format='' \
    old new

¥Ç¥£¥ì¥¯¥È¥ê¤ÎÈæ³Ó

ÊÒÊý¤Î¥Ç¥£¥ì¥¯¥È¥ê¤À¤±¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ¤Ï¡¢ diff ¤ÏÄ̾︺ߤ¹¤ë¥Õ¥¡¥¤¥ë¤ÎÆâÍƤòɽ¼¨¤»¤º¡¢ ¥Õ¥¡¥¤¥ë¤¬ÊÒÊý¤Ë¤¢¤Ã¤Æ¾Êý¤Ë¤Ï̵¤¤¤³¤È¤À¤±¤òÊó¹ð¤¹¤ë¡£ diff ¤Î¿¶Éñ¤¤¤òÊѤ¨¤Æ¡¢ ¾Êý¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤â¥Õ¥¡¥¤¥ë¤¬¶õ¤Î¾õÂ֤Ǹºß¤¹¤ë¤«¤Î¤è¤¦¤Ë Æ°ºî¤µ¤»¤ë¤³¤È¤â¤Ç¤­¤ë¡£¤¹¤Ê¤ï¤Á diff ¤Ï¼ÂºÝ¤Ë¸ºß¤¹¤ë¥Õ¥¡¥¤¥ë¤ÎÆâÍƤò¤¹¤Ù¤Æ½ÐÎϤ¹¤ë¡£ (¤³¤Î½ÐÎϤϡ¢¥Õ¥¡¥¤¥ë¤¬Âè 1 ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ì¤Ðºï½ü¡¢ Âè 2 ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ì¤ÐÁÞÆþ¤È¤Ê¤ë¡£) ¤³¤Î»ØÄê¤Ë¤Ï -N ¥ª¥×¥·¥ç¥ó¤ò»È¤¦¡£

¸Å¤¤¤Û¤¦¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËÂ礭¤Ê¥Õ¥¡¥¤¥ë¤¬¤¢¤Ã¤Æ¡¢ ¿·¤·¤¤¤Û¤¦¤Ë¤Ï¤Ê¤¤¾ì¹ç¡¢ -N ¥ª¥×¥·¥ç¥ó¤ÎÂå¤ï¤ê¤Ë -P ¥ª¥×¥·¥ç¥ó¤òÍѤ¤¤ë¤È¥Ñ¥Ã¥Á¤ÎÂ礭¤µ¤ò¾®¤µ¤¯¤Ç¤­¤ë¡£ -P ¥ª¥×¥·¥ç¥ó¤Ï -N ¥ª¥×¥·¥ç¥ó¤È»÷¤Æ¤¤¤ë¤¬¡¢Âè 2 ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë¤ÎÆâÍƤÀ¤±¤ò ½ÐÎϤËÁÞÆþ¤·¡¢Âè 1 ¥Ç¥£¥ì¥¯¥È¥ê¤À¤±¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë¤Ï̵»ë¤¹¤ë (¤¹¤Ê¤ï¤Á¡¢Äɲ䵤줿¥Õ¥¡¥¤¥ë¤À¤±¤ò°·¤¦)¡£ ¤½¤·¤Æ¡¢¥Ñ¥Ã¥Á¤òÅö¤Æ¤ëÁ°¤Ë¾Ãµî¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤òºï½ü¤¹¤ë¤è¤¦¡¢ ¥Ñ¥Ã¥Á¤ÎÀèƬ¤Ë¥Ñ¥Ã¥Á¤òÅö¤Æ¤ë¥æ¡¼¥¶¡¼¤Ø¤Î»Ø¼¨¤ò½ñ¤¯¡£

¥Ç¥£¥ì¥¯¥È¥ê¤ÎÈæ³Ó»þ¤ËÆÃÄê¤Î¥Õ¥¡¥¤¥ë¤ò̵»ë¤µ¤»¤ë¤Ë¤Ï¡¢ -x PATTERN ¥ª¥×¥·¥ç¥ó¤òÍѤ¤¤ë¡£¥·¥§¥ë¤È¤Ï°Û¤Ê¤ê¡¢¥Õ¥¡¥¤¥ë̾¤ÎÀèƬ¤Î¥Ô¥ê¥ª¥É¤Ï¡¢ ¥Ñ¥¿¡¼¥óÀèƬ¤Î¥ï¥¤¥ë¥É¥«¡¼¥É¤Ë¥Þ¥Ã¥Á¤¹¤ë¡£ ¥·¥§¥ë¤Ë¤è¤Ã¤ÆŸ³«¤µ¤ì¤Ê¤¤¤è¤¦¡¢ PATTERN ¤Ï¥¯¥©¡¼¥Èµ­¹æ¤Ç°Ï¤¦¤Ù¤­¤Ç¤¢¤ë¡£ Î㤨¤Ð `-x '*.[ao]'' ¤Ï `.a' ¤ä `.o' ¤Ç½ª¤ï¤ë̾Á°¤Î¥Õ¥¡¥¤¥ë¤ò¤¹¤Ù¤Æ̵»ë¤¹¤ë¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢Ê£¿ô»ØÄꤹ¤ë¤È¤½¤ì¤¾¤ì¤¬Í­¸ú¤Ë¤Ê¤ë¡£ Î㤨¤Ð `-x 'RCS' -x '*,v'' ¤È¤¤¤¦¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢ ¥Õ¥¡¥¤¥ë̾¤¬ `RCS' ¤À¤Ã¤¿¤ê `*,v' ¤Ç½ª¤ï¤ë¤è¤¦¤Ê ¥Õ¥¡¥¤¥ë¤È¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò¤¹¤Ù¤Æ̵»ë¤¹¤ë¡£  

ÊÖ¤êÃÍ

0

Á´¤¯Êѹ¹¤¬¤Ê¤«¤Ã¤¿¡£

1

Êѹ¹¤¬¤¢¤Ã¤¿¡£

2

²¿¤é¤«¤Î¥¨¥é¡¼¤¬µ¯¤³¤Ã¤¿¡£

´ØÏ¢¹àÌÜ

Ãí°Õ

Index

̾Á°

½ñ¼°

ÀâÌÀ

¥ª¥×¥·¥ç¥ó

½ÐÎϤηÁ¼°

context ·Á¼°

unified ·Á¼°

side-by-side ·Á¼°

ed(1) ·Á¼°

RCS ·Á¼°

IF-THEN-ELSE

C ¥½¡¼¥¹·Á¼°

¹Ô¥°¥ë¡¼¥×·Á¼°

¥°¥ë¡¼¥×ÊÑ´¹

¹Ô·Á¼°

¥Ç¥£¥ì¥¯¥È¥ê¤ÎÈæ³Ó

ÊÖ¤êÃÍ

´ØÏ¢¹àÌÜ

Ãí°Õ