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


5.1 ¥¿¥Ö¥¹¥È¥Ã¥×¤Î°ÌÃÖ¹ç¤ï¤»¤òÊÝ»ý¤¹¤ë

¤¤¤¯¤Ä¤«¤Îdiff½ÐÎϽñ¼°¤Î¥Æ¥­¥¹¥È¤Ë¤Ï,¥Æ¥­¥¹¥È¤¬ÁÞÆþ¤µ¤ì¤Æ¤¤¤ë¡¤ ºï½ü¤µ¤ì¤Æ¤¤¤ë¡¤¤Þ¤¿¤ÏÊѹ¹¤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò¼¨¤¹°ìʸ»ú¤Þ¤¿¤ÏÆóʸ»ú¤¬Á°ÃÖ¤µ ¤ì¤Þ¤¹¡¥¤³¤ì¤é¤Îʸ»ú¤òÄɲ乤뤳¤È¤Ç¡¤¥¿¥Ö¤¬¼¡¤Î¥¿¥Ö¥¹¥È¥Ã¥×¤Ë°Üư¤·¡¤¹Ô ¤Ç¤ÎÎó¤Î°ÌÃÖ·¤¨¤¬¤Ê¤¯¤Ê¤ê¤Þ¤¹¡¥GNU diff¤Ï¡¤¹Ô¤Ç¤Î¥¿¥Ö¤Ë ¤è¤ëÎó¤Î°ÌÃÖ·¤¨¤òÀµ¤·¤¯¤¹¤ëÆó¤Ä¤ÎÊýË¡¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡¥

ºÇ½é¤ÎÊýË¡¤Ï¡¤diff¤Ç½ÐÎϤ¹¤ëÁ°¤Ë¡¤¤¹¤Ù¤Æ¤Î¥¿¥Ö¤òÀµ¤·¤¤¿ô¤Î¥¹¥Ú¡¼ ¥¹¤ËÊѹ¹¤¹¤ë¤³¤È¤Ç¤¹¡¥¤³¤Î¼êË¡¤Ï-t¤ä--expand-tabs¥ª¥× ¥·¥ç¥ó¤ÇÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡¥diff¤Ï¥¿¥Ö¥¹¥È¥Ã¥×¤ò8Î󤴤ȤËÀßÄꤵ ¤ì¤Æ¤¤¤ë¤È²¾Äꤷ¤Þ¤¹¡¥¤³¤Î·Á¼°¤Î½ÐÎϤòpatch¤Ç»ÈÍѤ¹¤ë¤È¤­¡¤ patch¤Ë-l¤ä--ignore-white-space¥ª¥×¥·¥ç¥ó¤ò Í¿¤¨¤ëɬÍפ¬¤¢¤ê¤Þ¤¹(¾ÜºÙ¤Ï¡¤see Changed White Space)¡¥

¥¿¥Ö¤Î¹Ô¤Î·¤¨¤òÀµ¤·¤¯¤¹¤ë¤â¤¦°ì¤Ä¤ÎÊýË¡¤Ï¡¤¥¹¥Ú¡¼¥¹¤ÎÂå¤ï¤ê¤Ë¥¿¥Ö¤ò¡¤¹Ô ¤ÎºÇ½é¤Î»Ø¼¨Ê¸»ú¤Î¸å¤ËÄɲ乤ëÊýË¡¤Ç¤¹¡¥¤³¤ì¤Ç¡¤¤½¤ì°Ê²¼¤Î¤¹¤Ù¤Æ¤Î¥¿¥Öʸ »ú¤¬¸µ¤Î¥Õ¥¡¥¤¥ë¤Ç¤Î¥¿¥Ö¥¹¥È¥Ã¥×¤ËÂбþ¤·¤Æ¡¤½ÐÎϤΰÌÃÖ²ñ¤ï¤»¤¬Àµ¤·¤¯¤Ê¤ë ¤è¤¦¤Ë¡¤Æ±¤¸¾ì½ê¤Ë³Î¼Â¤Ë°ÌÃÖ¤·¤Þ¤¹¡¥¤½¤Î·çÅÀ¤Ï¡¤¹Ô¤¬Í¾¤ê¤ËŤ¯¤Ê¤ê²á¤®¤Æ¡¤ ²èÌ̤äÍÑ»æ¤Î°ì¹Ô¤ËŬ¤µ¤Ê¤¤¤è¤¦¤Ë¤Ê¤ë¤³¤È¤Ç¤¹¡¥¤Þ¤¿¡¤°ìÂ⽤·¤¿½ÐÎϽñ¼°¤Ç ¤ÏÊѹ¹·Á¼°¤ò¼¨¤¹Ê¸»ú¤Î¸å¤Ë¥¹¥Ú¡¼¥¹¤¬¤Ê¤¤¤Î¤Ç¡¤¤³¤ì¤Ç¤âưºî¤·¤Þ¤»¤ó¡¥¤³¤Î ¼êË¡¤Ï¡¤-T¤ä--initial-tab¥ª¥×¥·¥ç¥ó¤ÇÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡¥