Previous: Brief, Up: Comparison   [Contents][Index]


1.7 ¥Ð¥¤¥Ê¥ê¥Õ¥¡¥¤¥ë¤È¡¤¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤ÎÈæ³Ó¤Î¶¯À©

diff¤¬Èæ³Ó¤·¤Æ¤¤¤ëÆó¤Ä¤Î¥Õ¥¡¥¤¥ë¤Î¤¦¤Á¤Î°ìÊý¤¬¥Ð¥¤¥Ê¥ê(¥Æ¥­¥¹ ¥È¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¤)¤È¹Í¤¨¤ë¾ì¹ç¡¤Ä̾ï¥Õ¥¡¥¤¥ë¤ÎÁȤò³µÍפνÐÎϽñ¼°¤¬ÁªÂò ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë(see Brief)°·¤¤¡¤¥Ð¥¤¥Ê¥ê¥Õ¥¡¥¤¥ë¤¬°Û¤Ê¤Ã¤Æ¤¤¤ë¤³¤È ¤À¤±¤òÊó¹ð¤·¤Þ¤¹¡¥¤³¤ì¤Ï¡¤¹Ôñ°Ì¤Ç¤ÎÈæ³Ó¤¬¥Ð¥¤¥Ê¥ê¥Õ¥¡¥¤¥ë¤ËÂФ·¤ÆÉáÄÌ¤Ï °ÕÌ£¤¬Ìµ¤¤¤¿¤á¤Ç¤¹¡¥

¥Õ¥¡¥¤¥ë¤ÎºÇ½é¤Î¿ô¥Ð¥¤¥È¤òÄ´ºº¤·¤Æ¡¤diff¤Ï¥Õ¥¡¥¤¥ë¤¬¥Æ¥­¥¹¥È¤« ¥Ð¥¤¥Ê¥ê¤«¤ò·èÄꤷ¤Þ¤¹¡¥Àµ³Î¤Ê¥Ð¥¤¥È¿ô¤Ï¥·¥¹¥Æ¥à¤Ë°Í¸¤·¤Þ¤¹¤¬¡¤¤½¤ì¤ÏÄÌ ¾ï¿ôÀé¤Ë¤Ê¤ê¤Þ¤¹¡¥¥Õ¥¡¥¤¥ë¤Î°ìÉô¤Î¤¹¤Ù¤Æ¤Î¥Ð¥¤¥È¤¬‘null’¤Ç¤Ï¤Ê¤¤¾ì ¹ç¡¤diff¤Ï¥Õ¥¡¥¤¥ë¤¬¥Æ¥­¥¹¥È¤À¤È¹Í¤¨¤Þ¤¹¡¥¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï¡¤¥Õ¥¡ ¥¤¥ë¤¬¥Ð¥¤¥Ê¥ê¤À¤È¹Í¤¨¤Þ¤¹¡¥

¥Õ¥¡¥¤¥ë¤¬¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤À¤Èdiff¤Ë¶¯À©Åª¤Ë¹Í¤¨¤µ¤»¤¿¤¤¤È¤­¤â ¤¢¤ë¤Ç¤·¤ç¤¦¡¥Î㤨¤Ð¡¤‘null’ʸ»ú¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤òÈæ ³Ó¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡¥diff¤Ï¸í¤Ã¤Æ¡¤¤³¤ì¤é¤ò¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë ¤Ç¤Ï¤Ê¤¤¤È·èÄꤹ¤ë¤Ç¤·¤ç¤¦¡¥¤Þ¤¿¡¤‘null’ʸ»ú¤òÆÃ¼ì¤Ê¥Õ¥©¡¼¥Þ¥Ã¥È¤ò ¼¨¤¹¤¿¤á¤Ë»ÈÍѤ¹¤ë¥ï¡¼¥×¥í¥·¥¹¥Æ¥à¤Ç»ÈÍѤµ¤ì¤Æ¤¤¤ë¥Õ¥©¡¼¥Þ¥Ã¥È¤Î¥Õ¥¡¥¤¥ë ¤òÈæ³Ó¤¹¤ë²ÄǽÀ­¤â¤¢¤ê¤Þ¤¹¡¥-a¤ä--text¥ª¥×¥·¥ç¥ó¤ò»ÈÍÑ ¤¹¤ë¤³¤È¤Ç¡¤diff¤Ë¶¯À©Åª¤Ë¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤¬¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤Ç ¤¢¤ë¤È¹Í¤¨¤µ¤»¡¤¹Ô¤´¤È¤Ë¤½¤ì¤é¤òÈæ³Ó¤µ¤»¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥¤³¤Î¥ª¥×¥·¥ç¥ó ¤ò»ÈÍѤ·¤ÆÈæ³Ó¤·¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤¬¡¤¼ÂºÝ¤Ë¤Ï¥Æ¥­¥¹¥È¤ò´Þ¤ó¤Ç¤¤¤Ê¤¤¾ì¹ç¡¤¤ª ¤½¤é¤¯¥Õ¥¡¥¤¥ë¤Ë¤Ï¿ô¸Ä¤Î²þ¹Ôʸ»ú¤·¤«¤Ê¤¯¡¤diff¤Î½ÐÎϤϡ¤¥Õ¥¡¥¤ ¥ë¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Îʸ»ú¤«¤é¤Ê¤ëŤ¤¹Ô¤Îº¹°Û¤òɽ¼¨¤¹¤ëhunk¤Ë¤Ê¤ë¤Ç¤·¤ç ¤¦¡¥

¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò¥Ð¥¤¥Ê¥ê¥Õ¥¡¥¤¥ë¤À¤Èdiff¤Ë¶¯À©Åª¤Ë¹Í¤¨¤µ¤»¡¤ ¥Õ¥¡¥¤¥ë¤¬(¤É¤Î¤è¤¦¤Ë°Û¤Ê¤Ã¤Æ¤¤¤ë¤«¤Ç¤Ï¤Ê¤¯)°Û¤Ê¤Ã¤Æ¤¤¤ë¤«¤É¤¦¤«¤Î¤ß¤òÊó ¹ð¤µ¤»¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡¥¤³¤Î¤¿¤á¤Ë-q¤ä--brief¥ª¥×¥·¥ç ¥ó¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡¥

¥Ð¥¤¥Ê¥ê¥Õ¥¡¥¤¥ë¤Îº¹¤Ï¡¤diff¤Î½ÐÎÏ·ë²Ì¤¬¤¹¤Ù¤Æ¤Îº¹¤ò¼è¤êÀÚ¤ì¤Ê ¤¤¤Î¤Ç¡¤ÌäÂ꤬À¸¤¸¤ë¤È¹Í¤¨¤é¤ì¤Þ¤¹¡¥¤³¤ÎÌäÂê¤Ç¡¤diff¤Ï¥¹¥Æ¡¼¥¿ ¥¹2¤Ç½ªÎ»¤·¤Þ¤¹¡¥¤·¤«¤·¡¤¤³¤ÎÌäÂê¤Ï--a¤ä--text¥ª¥×¥·¥ç ¥ó¤òÍѤ¤¤¿¤ê¡¤-q¤ä--brief¥ª¥×¥·¥ç¥ó¤òÍѤ¤¤ë¤³¤È¤ÇȯÀ¸ ¤·¤Ê¤¤¤Î¤Ç¡¤¤³¤ì¤é¤É¤Á¤é¤Î¥ª¥×¥·¥ç¥ó¤Ç¤â¡¤diff¤Ï¥Ð¥¤¥Ê¥ê¥Õ¥¡¥¤ ¥ë¤ò¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤Î¤è¤¦¤Ë°·¤¤¤Þ¤¹¡¥

¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤È¥Ð¥¤¥Ê¥ê¥Õ¥¡¥¤¥ë¤Çº¹¤¬¤¢¤ë¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Ç¤Ï¡¤ diff¤ÏÄ̾¤¹¤Ù¤Æ¤Î¥Ç¡¼¥¿¤ò¥Æ¥­¥¹¥È¤È¤·¤ÆÆÉ¤ß½ñ¤­¤·¤Þ¤¹¡¥Âå¤ï ¤ê¤Ë¥Ð¥¤¥Ê¥ê¥Ç¡¼¥¿¤È¤·¤Ædiff¤ËÆÉ¤ß½ñ¤­¤µ¤»¤ë¤¿¤á¤Ë¡¤ --binary¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡¥¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¤ GNU¤äÅÁÅýŪ¤ÊUnix¥·¥¹¥Æ¥à¤Î¤è¤¦¤ÊPOSIX-½àµò¤Î¥·¥¹¥Æ¥à¤Ç¤Ï¸ú²Ì ¤¬¤¢¤ê¤Þ¤»¤ó¡¥¤·¤«¤·¡¤Â¿¤¯¤Î¥Ñ¡¼¥½¥Ê¥ë¥³¥ó¥Ô¥å¡¼¥¿¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹ ¥Æ¥à¤Ç¤Ï¡¤¹ÔËö¤Î²þ¹Ô¤Î¸å¤Ë¥­¥ã¥ê¥Ã¥¸¥ê¥¿¡¼¥ó¤¬Â¸ºß¤·¤Þ¤¹¡¥¤½¤Î¤è¤¦¤Ê¥·¥¹ ¥Æ¥à¤Ç¤Ï¡¤diff¤ÏÄ̾ïÆþÎϤµ¤ì¤ë¤³¤ì¤é¤Î¥­¥ã¥ê¥Ã¥¸¥ê¥¿¡¼¥ó¤ò̵»ë ¤·¡¤¤½¤ì¤¾¤ì¤Î½ÐÎϤιÔËö¤Ë¥­¥ã¥ê¥Ã¥¸¥ê¥¿¡¼¥ó¤òÀ¸À®¤·¤Þ¤¹¤¬¡¤ --binary¥ª¥×¥·¥ç¥ó¤òÍѤ¤¤ë¤Èdiff¤Ï¤½¤ì¤¾¤ì¤Î¥­¥ã¥ê¥Ã ¥¸¥ê¥¿¡¼¥ó¤ò¤½¤Î¤Þ¤ÞÆþÎÏʸ»ú¤È¤·¤Æ°·¤¤¡¤¤½¤ì¤¾¤ì¤Î½ÐÎϤιÔËö¤Ë¥­¥ã¥ê¥Ã¥¸ ¥ê¥¿¡¼¥ó¤òÀ¸À®¤·¤Þ¤»¤ó¡¥POSIX-½àµò¤Î¥·¥¹¥Æ¥à¤ÇÊÑ´¹¤¹¤ëͽÄê¤Î¥Æ¥­¥¹ ¥È¤Ç¤Ï¤Ê¤¤¥Õ¥¡¥¤¥ë¤ò°·¤¦¤È¤­¡¤¤³¤ì¤ÏÌò¤ËΩ¤Ä¤Ï¤º¤Ç¤¹¡¥

--strip-trailing-cr¤Ç¡¤diff¤Ï¹ÔËö¤Î²þ¹Ô¤Ë¥­¥ã¥ê¥Ã¥¸¥ê ¥¿¡¼¥ó¤¬Â³¤¤¤Æ¤¤¤ëÆþÎϹԤòÉáÄ̤βþ¹Ô¤È¤·¤Æ°·¤¤¤Þ¤¹¡¥Â¿¤¯¤Î¥Ñ¡¼¥½¥Ê¥ë¥³¥ó ¥Ô¥å¡¼¥¿¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤«¤é¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿ÉÔ´°Á´¤Ê¥Æ¥­¥¹¥È¤ò Èæ³Ó¤¹¤ë¤È¤­¡¤¤³¤ì¤ÏÌò¤ËΩ¤Ä¤Ï¤º¤Ç¤¹¡¥¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¹Ô¤¬ÆÉ¤ß¹þ¤Þ¤ì¤ëÊý Ë¡¤Ë±Æ¶Á¤¬¤¢¤ê¡¤¤½¤ì¤Ï½ç¼¡¡¤Èæ³Ó¤µ¤ì¤ëÊýË¡¤È½ÐÎϤÎÊýË¡¤Ë±Æ¶Á¤·¤Æ¤¤¤­¤Þ¤¹¡¥

Æó¤Ä¤Î¥Õ¥¡¥¤¥ë¤ò¥Ð¥¤¥Èñ°Ì¤ÇÈæ³Ó¤·¤¿¤¤¾ì¹ç¡¤Æó¤Ä¤Î¥Õ¥¡¥¤¥ë¤Î¥Ð¥¤¥È¤´¤È¤Î º¹¤ÎÃͤòɽ¼¨¤¹¤ë¤¿¤á¤Ë¡¤-l¥ª¥×¥·¥ç¥ó¤òÍѤ¤¤Æcmp¥×¥í¥° ¥é¥à¤ò»ÈÍѤ¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥GNU cmp¤òÍѤ¤¤ë¤È¡¤¤³¤ì¤é¤Î ¥Ð¥¤¥È¤ÎASCIIɽ¸½¤òɽ¼¨¤¹¤ë¤¿¤á¤Ë-b¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤³ ¤È¤â²Äǽ¤Ç¤¹¡¥¾ÜºÙ¤ÏSee Invoking cmp.

Èæ³Ó¤·¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Î¤¤¤º¤ì¤«¤òdiff3¤¬¥Ð¥¤¥Ê¥ê(¥Æ¥­¥¹¥È¤Ç¤Ï¤Ê ¤¤¥Õ¥¡¥¤¥ë)¤È¹Í¤¨¤ë¾ì¹ç¡¤¤½¤Î¤è¤¦¤ÊÈæ³Ó¤ÏÉáÄ̰ÕÌ£¤¬Ìµ¤¤¤Î¤Ç¡¤Ä̾ï¤Ï¥¨¥é¡¼ ¤òÊó¹ð¤·¤Þ¤¹¡¥diff3¤Ï¡¤¥Õ¥¡¥¤¥ë¤¬¥Ð¥¤¥Ê¥ê¤«¤É¤¦¤«¤ò diff¤¬·èÄꤹ¤ë¥Æ¥¹¥È¤ÈƱ¤¸¥Æ¥¹¥È¤ò»ÈÍѤ·¤Þ¤¹¡¥diff¤ò ÍѤ¤¤ë¤È¤­¤ÈƱÍͤˡ¤ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ë¥Æ¥­¥¹¥È¤Ç¤Ê¤¤¥Ð¥¤¥È¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¤¬¡¤ ¤½¤ì°Ê³°¤Ï¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤Ë»÷¤Æ¤¤¤ë¾ì¹ç¡¤-a¤ä--text¥ª ¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¡¤diff3¤Ë¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò¥Æ¥­¥¹¥È¥Õ¥¡ ¥¤¥ë¤È¹Í¤¨¤µ¤»¡¤¹Ôñ°Ì¤Ç¤ÎÈæ³Ó¤ò¶¯À©¤µ¤»¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥