Next: , Previous: Adjusting Output, Up: Top   [Contents][Index]


6 diff¤ÎÀ­Ç½¤Î¥È¥ì¡¼¥É¥ª¥Õ

GNU diff¤Ï¸úΨŪ¤Ëưºî¤·¤Þ¤¹¡¥¤·¤«¤·¡¤¾õ¶·¤Ë¤è¤Ã¤Æ¤Ï¤è¤ê ®¤¯¡¤¤è¤ê¾®¤µ¤ÊÊѹ¹¤ÎÁȤòÀ¸À®¤µ¤»¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥

diff¤Î¸úΨ¤ò²þÁ±¤¹¤ëÊýË¡¤Î°ì¤Ä¤Ï¡¤¥³¥Ô¡¼¤ÎÂå¤ï¤ê¤Ë¥Ï¡¼¥É¥ê¥ó¥¯ ¤ä¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¤¹¡¥diff¤ÏÄ̾Ʊ¤¸¥Õ¥¡¥¤ ¥ë¤Ø¤ÎÆó¤Ä¤Î¥Ï¡¼¥É¥ê¥ó¥¯¤ä¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ÏÆâÍÆ¤¬Æ±¤¸¤Ï¤º¤Ê¤Î¤ÇÆÉ¤ß¹þ ¤àɬÍפ¬¤Ê¤¤¤¿¤á¡¤¤³¤ì¤Ç¸úΨ¤¬²þÁ±¤·¤Þ¤¹¡¥Î㤨¤Ð¡¤Â礭¤Ê¥Ç¥£¥ì¥¯¥È¥ê³¬ÁØ ¤ò¥³¥Ô¡¼¤·¤Æ¡¤¥³¥Ô¡¼¤ËÂФ·¤¤¤¯¤Ä¤«Êѹ¹¤·¤Æ¡¤¤½¤·¤Æ¥ª¥ê¥¸¥Ê¥ë¤È¥³¥Ô¡¼¤òÈæ ³Ó¤¹¤ë¤Î¤Ë‘diff -r’¤ò»ÈÍѤ¹¤ë¤³¤È¤¬Â¿¤¤¤È²¾Äꤷ¤Þ¤¹¡¥¥ª¥ê¥¸¥Ê¥ë¤Î¥Õ¥¡ ¥¤¥ë¤¬ÆÉ¤ß¹þ¤ßÀìÍѤξì¹ç¡¤¥Ï¡¼¥É¥ê¥ó¥¯¤ä¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ò»ÈÍѤ·¤Æ¥³¥Ô¡¼ ¤òºîÀ®¤¹¤ë(Î㤨¤Ð¡¤GNUcp -lR’¤ä‘cp -sR’¤òÍѤ¤¤ë)¤³¤È¤Ç¡¤ ¸úΨ¤ò¤«¤Ê¤ê²þÁ±¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥¥³¥Ô¡¼¤Î¥Õ¥¡¥¤¥ë¤òºÇ½é¤ËÊÔ½¸¤¹¤ëÁ°¤Ë¡¤ ¥ê¥ó¥¯¤òÀڤäơ¤Ä̾ï¤Î¥³¥Ô¡¼¤ÇÃÖ´¹¤¹¤Ù¤­¤Ç¤¹¡¥

¥Õ¥¡¥¤¥ëÈæ³Ó¤ÎÊýË¡¤òÊѹ¹¤¹¤ë¥ª¥×¥·¥ç¥ó¤òÍ¿¤¨¤ë¤³¤È¤Ç¡¤GNU diff¤Î¸úΨ¤Ë±Æ¶Á¤òÍ¿¤¨¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡¥¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¤ ¾¤Î¤â¤Î¤òµ¾À·¤Ë¤·¤Æ¸úΨ²þÁ±¤Î¸«ÃϤǼÂÁõ¤µ¤ì¤Æ¤¤¤¿¤ê¡¤Â¾¤Î¤â¤Î¤Ë³²¤òÍ¿¤¨ ¤Ê¤¬¤é¡¤¾ì¹ç¤Ë¤è¤Ã¤Æ¤Ï¸úΨ¤ò²þÁ±¤·¤¿¤ê¤·¤Þ¤¹¡¥

GNU diff¤¬Êѹ¹¤µ¤ì¤¿¹Ô¤ò·èÄꤹ¤ëÊýË¡¤Ï¡¤¾ï¤ËºÇ¾®¸Â¤Îº¹°Û ¤Î½¸¹ç¤Ç¸«¤Ä¤±½Ð¤·¤Þ¤¹¡¥Ä̾綠¤ì¤Ï¡¤¼ÂÍÑŪ¤ÊÌÜŪ¤È¤·¤Æ¤Ï½½Ê¬¤Ç¤¹¡¥ diff¤Î½ÐÎϤ¬Â礭¤¤¾ì¹ç¡¤¤è¤ê¾®¤µ¤Êº¹°Û¤Î½¸¹ç¤òÀ¸À®¤¹¤ë¤¿¤á¤Ë¡¤ diff¤ò½¤Àµ¤µ¤ì¤¿¥¢¥ë¥´¥ê¥º¥à¤Ç»ÈÍѤ·¤¿¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡¥ -d¤ä--minimal¤Ç¤³¤¦¤Ê¤ê¤Þ¤¹¡¥¤·¤«¤·¡¤Ä̾ï¤Ï diff¤Î¼Â¹Ô¤¬ÃÙ¤¯¤Ê¤ë¤Î¤Ç¡¤¥Ç¥Õ¥©¥ë¥È¤Îưºî¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡¥

Èæ³Ó¤·¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤¬Â礭¤¯¡¤Á´ÂΤòÄ̤¸¤ÆÊѹ¹Éôʬ¤Î¾®¤µ¤Ê½¸¹ç¤¬ÅÀºß¤·¤Æ ¤¤¤ë¤È¤­¡¤diff¤¬»ÈÍѤ¹¤ë¥¢¥ë¥´¥ê¥º¥à¤È¤Ï°Û¤Ê¤ëÊѹ¹¤ò¹Ô¤Ê¤¦¡¤ --speed-large-files¤ò»ÈÍѤ¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡¥ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬°ìÄê ¤·¤Æ¾®¤µ¤ÊÌ©ÅÙ¤ÇÊѹ¹¤µ¤ì¤Æ¤¤¤ë¤È¤­¡¤¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç½ÐÎϤòÊѹ¹¤¹¤ë¤³¤È¤Ê ¤¯Èæ³Ó¤Î®ÅÙ¤¬¸þ¾å¤·¤Þ¤¹¡¥¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡¤diff¤ÏÂ礭¤Êº¹°Û¤ÎÁÈ ¤òÀ¸À®¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡¥¤·¤«¤·¡¤½ÐÎϤÏÀµ¤·¤¤¤Þ¤Þ¤Ç¤¹¡¥

Ä̾ïdiff¤Ï¡¤º¹°ÛÉôʬ¤ÎºÇ¾®ÁȤò¸«¤Ä¤±¤è¤¦¤È¤¹¤ëÁ°¤Ë¡¤Î¾Êý¤Î¥Õ¥¡ ¥¤¥ë¤Ë¶¦Ä̤ʺǽé¤ÎÉôʬ¤È½ª¤ê¤ÎÉôʬ¤òÇË´þ¤·¤Þ¤¹¡¥¤³¤ì¤Çdiff¤Î¼Â ¹Ô¤Ï®¤¯¤Ê¤ê¤Þ¤¹¤¬¡¤ºÇ¾®¤Î½ÐÎϤǤϤʤ¯¤Ê¤ë¤³¤È¤â¤¢¤ë¤Ç¤·¤ç¤¦¡¥ --horizon-lines=lines¥ª¥×¥·¥ç¥ó¤Ï¡¤diff¤¬ºÇ½é¤Î Éôʬ¤ÎºÇ¸å¤Îlines¹Ô¤È½ª¤ê¤ÎÉôʬ¤ÎºÇ½é¤Îlines¹Ô¤òÇË´þ¤¹¤ë¤³¤È ¤ò˸¤²¤Þ¤¹¡¥¤³¤ì¤Ç¡¤diff¤Ï¤è¤êºÇ¾®¤Î½ÐÎϤò¸«¤Ä¤±¤ë¤³¤È¤Ë¤Ê¤ë¤Ç ¤·¤ç¤¦¡¥

Êѹ¹¤µ¤ì¤¿¹Ô¤ËϢ³¤¹¤ë¹Ô¤¬´Þ¤Þ¤ì¤Æ¤¤¤Æ¡¤¤½¤ì°Ê³°¤Ç¤ÏƱ°ì¹Ô¤¬Ï¢Â³¤·¤Æ¤¤¤ë ¤È²¾Äꤷ¤Æ¤¯¤À¤µ¤¤¡¥diff¥³¥Þ¥ó¥É¤Ï¡¤hunk¤Ë´Þ¤Þ¤ì¤Æ¤ëϢ³¤·¤¿Æ± ¤¸Éôʬ¤ò¼«Í³¤ËÁªÂò¤·¤Þ¤¹¡¥¤³¤Î¾ì¹ç¡¤diff¤ÏÄ̾ÎÙÀܤ¹¤ëhunk¤ò ¥Þ¡¼¥¸¤¹¤ë¤È¤­¤Ïhunk¤Î¶­³¦¤Î°ÌÃÖ¤òÊѹ¹¤·¤¿¤ê¡¤hunk¤Î¹Ô¤ò¥Õ¥¡¥¤¥ë¤Î½ª¤ê¤Þ ¤Ç°ÌÃÖ¤òÊѹ¹¤·¤¿¤ê¤·¤Þ¤¹¡¥hunk¤Î¥Þ¡¼¥¸¤Ï½ÐÎϹԤθ«±É¤¨¤òÎɤ¯¤¹¤ë¤³¤È¤â¤¢ ¤ë¤Ï¤º¤Ç¤¹¡¥