Next: , Previous: Normal, Up: Output Formats   [Contents][Index]


2.3 ¼þ¤ê¤Îʸ¤òÍѤ¤¤¿º¹¤Îɽ¼¨

Ä̾¥Õ¥¡¥¤¥ë´Ö¤Îº¹¤ò¸«¤ë¤È¤­¤Ï¡¤Àµ³Î¤Ë²¿¤¬Êѹ¹¤µ¤ì¤¿¤Î¤«¤òÍý²ò¤¹¤ë¼ê½õ ¤±¤È¤Ê¤ë¡¤¥Õ¥¡¥¤¥ë¤Îº¹¤¬¤¢¤ë¹Ô¤Î¼þ¤ê¤ÎÉôʬ¤â¸«¤¿¤¤¤È»×¤¦¤Ç¤·¤ç¤¦¡¥¤³¤Î¤è ¤¦¤Ê¥Õ¥¡¥¤¥ë¤Î¼þ¤ê¤ÎÉôʬ¤òcontext(¼þ¤ê¤Îʸ)¤È¸Æ¤Ó¤Þ¤¹¡¥

GNU diff¤Ï°Û¤Ê¤Ã¤Æ¤¤¤ë¹Ô¤Î¼þ¤ê¤Îʸ¤òɽ¼¨¤¹¤ë¡¤Æó¤Ä¤Î½ÐÎÏ ½ñ¼°¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡¥context format(¼þ¤ê¤Îʸ¤òÍѤ¤¤¿½ñ¼°)¤È unified format(°ìÂ⽤·¤¿½ñ¼°)¤Ç¤¹¡¥¤½¤ì¤Ç¡¤°Û¤Ê¤Ã¤Æ¤¤¤ë¹Ô¤¬¸«¤Ä¤«¤Ã ¤¿´Ø¿ô¤ä¥Õ¥¡¥¤¥ë¤Î¥»¥¯¥·¥ç¥ó¤òÄɲÃɽ¼¨¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥

diff¤Î½ÐÎÏ·Á¼°¤Ç¡¤Â¾¿Í¤Ë¥Õ¥¡¥¤¥ë¤Î¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤òÇÛÉÛ¤¹¤ë¾ì ¹ç¡¤Èà¤é¤¬¥Õ¥¡¥¤¥ë¤ËÆÈ¼«¤ÎÊѹ¹¤ò¤·¤Æ¤¤¤ë¾ì¹ç¤Ç¤âº¹Ê¬¤òŬÍѤǤ­¤ë¤è¤¦¤Ë¡¤ ¼þ¤ê¤Îʸ¤òɽ¼¨¤¹¤ë½ÐÎÏ·Á¼°¤Î°ì¤Ä¤ò»ÈÍѤ¹¤Ù¤­¤Ç¤¹¡¥¤³¤Î¾õ¶·¤Ç¤â¡¤°Û¤Ê¤Ã¤Æ ¤¤¤ë¹Ô¤Î¼þ¤ê¤Îʸ¤Î¹Ô¤ò¥Õ¥¡¥¤¥ëÆâ¤Çõ¤¹¤³¤È¤Ç¡¤patch¤Çº¹Ê¬¤òŬ ÍѤ¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥¤³¤ì¤é¤Î¹Ô¤¬º¹Ê¬¤¬¹ð¤²¤Æ¤¤¤ë¾ì½ê¤«¤é¼ÂºÝ¤Ë¤Ï¿ô¹ÔÎ¥ ¤ì¤Æ¤¤¤Æ¤â¡¤patch¤Ï¹ÔÈÖ¹æ¤òÄ´À°¤·¡¤º¹Ê¬¤òÀµ¤·¤¯Å¬ÍѤ¹¤ë¤³¤È¤¬ ²Äǽ¤Ç¤¹¡¥ÉÔ´°Á´¤Êº¹Ê¬¤òŬÍѤ¹¤ë¤¿¤á¤Ëpatch¤ò»ÈÍѤ¹¤ë¾ÜºÙ¤Ï¡¤ See Imperfect.