Next: Invoking diff3, Previous: Invoking cmp, Up: Top [Contents][Index]
diff
¤Î¸Æ¤Ó½Ð¤·diff
¥³¥Þ¥ó¥É¤Î¼Â¹Ô½ñ¼°¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡¥
diff options… files…
ºÇ¤âñ½ã¤Ê¾ì¹ç¡¤Æó¤Ä¤Î¥Õ¥¡¥¤¥ë̾from-file¤Èto-file¤¬Í¿¤¨¤é¤ì
¤Æ¤¤¤Æ¡¤diff
¤Ïfrom-file¤Èto-file¤ÎÆâÍÆ¤òÈæ³Ó¤·¤Þ¤¹¡¥
¥Õ¥¡¥¤¥ë̾-¤Ïɸ½àÆþÎϤ«¤éÆÉ¤ß¹þ¤Þ¤ì¤¿¥Æ¥¥¹¥È¤ò°ÕÌ£¤·¤Þ¤¹¡¥ÆÃÊ̤Ê
¾ì¹ç¤È¤·¤Æ¡¤‘diff - -’¤Ï¡¤É¸½àÆþÎϤΥ³¥Ô¡¼¤Èɸ½àÆþÎϼ«¿È¤òÈæ³Ó¤·¤Þ
¤¹¡¥
°ì¤Ä¤Î¥Õ¥¡¥¤¥ë¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Ç¡¤¤â¤¦°ìÊý¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤Ê¤¤¾ì¹ç¡¤
diff
¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò»ý¤Ä¤â¤¦°ì¤Ä¤Î¥Ç¥£¥ì
¥¯¥È¥ê¤Î¥Õ¥¡¥¤¥ë¤ÈÈæ³Ó¤·¤Þ¤¹¡¥¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤Ê¤¤¥Õ¥¡¥¤¥ë¤ò¡¤-¤Ë
¤·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡¥
Æó¤Ä¤Î¥Õ¥¡¥¤¥ë̾¤¬Í¿¤¨¤é¤ìξÊý¤È¤â¥Ç¥£¥ì¥¯¥È¥ê¤Î¾ì¹ç¡¤diff
¤Ïξ
Êý¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ÎÂбþ¤¹¤ë¥Õ¥¡¥¤¥ë¤ò¡¤¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç¤ËÈæ³Ó¤·¤Þ¤¹¡¥¤³¤Î
Èæ³Ó¤Ï¡¤-r¤ä--recursive¥ª¥×¥·¥ç¥ó¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Ê¤¤¸Â
¤êºÆµ¢Åª¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡¥diff
¤Ï¡¤¥Ç¥£¥ì¥¯¥È¥ê¤Î¼ÂºÝ¤ÎÆâÍÆ¤ò¥Õ¥¡
¥¤¥ë¤Ç¤¢¤ë¤«¤Î¤è¤¦¤ËÈæ³Ó¤·¤Þ¤»¤ó¡¥É¸½àÆþÎϤˤÏ̾Á°¤¬Ìµ¤¯“Ʊ¤¸Ì¾Á°¤Î¥Õ¥¡
¥¤¥ë”¤È¤¤¤¦³µÇ°¤¬Å¬ÍѤǤ¤Ê¤¤¤Î¤Ç¡¤´°Á´¤Ë»ØÄꤵ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤òɸ½àÆþ
ÎϤˤ·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡¥
--from-file=file¥ª¥×¥·¥ç¥ó¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤ë¾ì¹ç¡¤¥Õ¥¡¥¤¥ë ̾¤Î¿ô¤ÏǤ°Õ¤Ç¡¤file¤½¤ì¤¾¤ì»ØÌ¾¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ÇÈæ³Ó¤µ¤ì¤Þ¤¹¡¥Æ±ÍÍ ¤Ë¡¤--to-file=file¥ª¥×¥·¥ç¥ó¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤ë¾ì¹ç¡¤¤½¤ì¤¾ ¤ì»ØÌ¾¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤¬¡¤file¤ÈÈæ³Ó¤µ¤ì¤Þ¤¹¡¥
diff
¤Î¥ª¥×¥·¥ç¥ó¤Ï‘-’¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤ë¤Î¤Ç¡¤‘-’¤Ç»Ï¤Þ¤ë
¥Õ¥¡¥¤¥ë̾¤ÏÄ̾ïÍøÍÑÉÔ²Äǽ¤Ç¤¹¡¥¤·¤«¤·¡¤°ú¿ô¤È¤·¤Æ--¼«¿È¤ò¤òÍ¿
¤¨¤ë¤³¤È¤Ç¡¤»Ä¤ê¤Î¥Õ¥¡¥¤¥ë̾¤¬‘-’¤Ç»Ï¤Þ¤ë¾ì¹ç¤Ç¤â¤½¤ì¤ò¥Õ¥¡¥¤¥ë̾¤È
¤·¤Æ°·¤¤¤Þ¤¹¡¥
½ªÎ»¥¹¥Æ¡¼¥¿¥¹0¤Ïº¹°Û¤¬Ìµ¤¤¤³¤È¤ò°ÕÌ£¤·¡¤1¤Ïº¹°Û¤¬¸«¤Ä¤«¤Ã¤¿¤³¤È¤ò°ÕÌ£¤·¡¤ ¤½¤·¤Æ2¤ÏÌäÂ꤬¤¢¤Ã¤¿¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡¥
• diff Options: | Summary of options to diff .
|