Next: Output Formats, Previous: Overview, Up: Top [Contents][Index]
Æó¤Ä¤Î¥Õ¥¡¥¤¥ë´Ö¤Îº¹¤ò¹Í¤¨¤ë¤È¤¤¤¤¯¤Ä¤«¤ÎÊýË¡¤¬¤¢¤ê¤Þ¤¹¡¥º¹¤ò¹Í¤¨¤ë¤È¤
¤Î°ì¤Ä¤ÎÊýË¡¤Ï¡¤Ê̤Υե¡¥¤¥ë¤òÀ¸À®¤¹¤ë¤¿¤á¤Ë¡¤¤Þ¤È¤Þ¤Ã¤¿¹Ô¤¬¤¢¤ë¥Õ¥¡¥¤¥ë
¤«¤éºï½ü¡¤ÁÞÆþ¡¤¤Þ¤¿¤ÏÊѹ¹¤µ¤ì¤Æ¤¤¤ë¤È¤¤¤¦¤³¤È¤Ç¤¹¡¥diff
¤Ï¹Ôñ
°Ì¤ÇÆó¤Ä¤Î¥Õ¥¡¥¤¥ë¤òÈæ³Ó¤·¡¤°Û¤Ê¤Ã¤Æ¤¤¤ë¹Ô¤Î¤Þ¤È¤Þ¤ê¤òõ¤·¡¤¤½¤·¤Æ¡¤°Û¤Ê¤Ã
¤Æ¤¤¤ë¤½¤ì¤¾¤ì¤Î¤Þ¤È¤Þ¤ê¤òÊó¹ð¤·¤Þ¤¹¡¥ÌÜŪ¤Ë¤è¤Ã¤Æ¡¤¤¤¤¯¤Ä¤«¤Î½ñ¼°¤Ç°Û¤Ê¤Ã
¤Æ¤¤¤ë¹Ô¤òÊó¹ð¤µ¤»¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥
GNU diff
¤Ç¤Ï¡¤¾ÜºÙ¤Êº¹°Û¤òÍѤ¤¤º¤Ë¥Õ¥¡¥¤¥ë¤¬°Û¤Ê¤Ã¤Æ¤¤¤ë
¤«¤É¤¦¤«¤òɽ¼¨¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥¤½¤ì¤Ï¡¤½ÅÍפǤϤʤ¤º¹°Û¤Îɽ¼¨¤òÍÞÀ©¤¹
¤ëÊýË¡¤âÄ󶡤·¤Æ¤¤¤Þ¤¹¡¥ºÇ¤â°ìÈÌŪ¤Ê¤³¤È¤È¤·¤Æ¡¤¤½¤Î¤è¤¦¤Êº¹¤Ïñ¸ì¤ä¹Ô¤Î
´Ö¤Î¶õÇò¤Î¿ô¤¬Êѹ¹¤µ¤ì¤Æ¤¤¤ë¤â¤Î¤Ç¤¹¡¥diff
¤Ï¡¤¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¤Î
Âçʸ»ú¾®Ê¸»ú¤Îº¹¤ä¡¤Ä󶡤µ¤ì¤Æ¤¤¤ëÀµµ¬É½¸½¤Ë¥Þ¥Ã¥Á¤¹¤ë¹Ô¤Îº¹¤Îɽ¼¨¤òÍÞÀ©
¤¹¤ëÊýË¡¤âÄ󶡤·¤Æ¤¤¤Þ¤¹¡¥¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤ÏÎßÀѤµ¤ì¤Þ¤¹¡¥Î㤨¤Ð¡¤¶õÇò
¤È¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¤ÎÂçʸ»ú¾®Ê¸»ú¤ÎÊѹ¹¤ò̵»ë¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥
Æó¤Ä¤Î¥Õ¥¡¥¤¥ë¤Îº¹¤ò¹Í¤¨¤ë¤â¤¦°ì¤Ä¤ÎÊýË¡¤È¤·¤Æ¡¤¥Ð¥¤¥È¤Î½¸¹ç¤¬Æ±°ì¤Þ¤¿¤Ï
°Û¤Ê¤Ã¤Æ¤¤¤ë¤È¤¤¤¦¤Î¤â¤¬¤¢¤ê¤Þ¤¹¡¥cmp
¤ÏÆó¤Ä¤Î¥Õ¥¡¥¤¥ë´Ö¤Îº¹¤ò¡¤
¹Ôñ°Ì¤Ç¤Ï¤Ê¤¯¡¤¥Ð¥¤¥Èñ°Ì¤ÇÊó¹ð¤·¤Þ¤¹¡¥·ë²Ì¤È¤·¤Æ¡¤¥Ð¥¤¥Ê¥ê¥Õ¥¡¥¤¥ë¤ËÂÐ
¤·¤Ædiff
¤ò»ÈÍѤ¹¤ë¤è¤ê¡¤ÍÚ¤«¤ËÌò¤ËΩ¤Ä¤³¤È¤¬Â¿¤¤¤Ç¤·¤ç¤¦¡¥¥Æ¥
¥¹¥È¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ¤Ï¡¤Æó¤Ä¤Î¥Õ¥¡¥¤¥ë¤¬Æ±°ì¤«¤É¤¦¤«¡¤¤Þ¤¿¤Ï¡¤°ì¤Ä¤Î¥Õ¥¡
¥¤¥ë¤¬¤â¤¦°ìÊý¤Î¥Õ¥¡¥¤¥ë¤ËÁ°ÃÖ¤µ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¤òÃΤꤿ¤¤¤À¤±¤Î¤È¤¡¤¼ç
¤ËÌò¤ËΩ¤Ä¤Ç¤·¤ç¤¦¡¥
¥Ð¥¤¥Èñ°Ì¤Ç¤ÎÊѹ¹¤ò¹Íθ¤¹¤ë±Æ¶Á¤òÀâÌÀ¤¹¤ë¤Ë¤Ï¡¤¹Ôñ°Ì¤Ç¤ÎÊѹ¹¤ò¹Íθ¤¹¤ë
¤³¤È¤ÈÈæ³Ó¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¡¤Î㤨¤Ðñ°ì¤Î²þ¹Ôʸ»ú¤¬¥Õ¥¡¥¤¥ë¤ÎºÇ½é¤Ë¤¢¤ë¾ì
¹ç¤Ë²¿¤¬À¸¤¸¤ë¤«¤ò¹Í¤¨¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡¥¤½¤Î¥Õ¥¡¥¤¥ë¤ò¡¤ºÇ½é¤Ë²þ¹Ô¤¬Ìµ¤¤¤À
¤±¤ÎƱ°ì¤ÎÊÌ¥Õ¥¡¥¤¥ë¤ÈÈæ³Ó¤¹¤ë¾ì¹ç¡¤diff
¤Ç¤Ï²þ¹Ô¤¬¥Õ¥¡¥¤¥ë¤ËÄÉ
²Ã¤µ¤ì¤¿¤³¤È¤òÊó¹ð¤·¤Þ¤¹¤¬¡¤cmp
¤Ç¤ÏÆó¤Ä¤Î¥Õ¥¡¥¤¥ë¤Ï¤Û¤È¤ó¤ÉÁ´
ÂΤ¬°Û¤Ê¤Ã¤Æ¤¤¤ë¤ÈÊó¹ð¤¹¤ë¤Ç¤·¤ç¤¦¡¥
diff3
¤Ï¡¤Ä̾ﻰ¤Ä¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤ò¹Ôñ°Ì¤ÇÈæ³Ó¤·¡¤º¹°Û¤Î¤¢¤ë¹Ô
¤Î¤Þ¤È¤Þ¤ê¤ò¸«¤Ä¤±¡¤¤½¤ì¤¾¤ì¤Îº¹°Û¤Î¤¢¤ë¹Ô¤Î¤Þ¤È¤Þ¤ê¤òÊó¹ð¤·¤Þ¤¹¡¥¤½¤Î½Ð
ÎϤϡ¤Æ±¤¸¥Õ¥¡¥¤¥ë¤òÊѹ¹¤·¤¿Æó¤Ä¤Î¤â¤Î¤Îº¹¤òÄ´¤Ù¤ë¤³¤È¤òÍÆ°×¤Ë¤¹¤ë¤è¤¦¤Ë
À߷פµ¤ì¤Æ¤¤¤Þ¤¹¡¥
• Hunks: | Groups of differing lines. | |
• White Space: | Suppressing differences in white space. | |
• Blank Lines: | Suppressing differences in blank lines. | |
• Case Folding: | Suppressing differences in alphabetic case. | |
• Specified Folding: | Suppressing differences that match regular expressions. | |
• Brief: | Summarizing which files are different. | |
• Binary: | Comparing binary files or forcing text comparisons. |