Next: , Previous: Context Format, Up: Context   [Contents][Index]


2.3.2 °ìÂ⽤·¤¿½ñ¼°

°ìÂ⽤·¤¿½ÐÎϽñ¼°¤Ï¼þ¤ê¤Îʸ¤ò»ÈÍѤ·¤¿½ñ¼°¤ÎÊÑ·Á¤Ç¡¤¾éĹ¤Ê¼þ¤ê¤Î¹Ô¤ò¾Êά ¤·¤Æ¤¤¤Æ¡¤¤è¤ê¥³¥ó¥Ñ¥¯¥È¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡¥¤³¤Î½ÐÎϽñ¼°¤òÁªÂò¤¹¤ë¤¿¤á¡¤ -U lines¡¤--unified[=lines]¡¤¤Þ¤¿ ¤Ï-u¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡¥°ú¿ôlines¤Ï¡¤É½¼¨¤¹¤ë¼þ ¤ê¤Î¹Ô¿ô¤Ç¤¹¡¥Í¿¤¨¤é¤ì¤Æ¤¤¤Ê¤¤¤È¤­¡¤¥Ç¥Õ¥©¥ë¥È¤Ï»°¹Ô¤Ç¤¹¡¥

¸½ºß¡¤GNU diff¤À¤±¤¬¤³¤Î½ñ¼°¤òÀ¸À®¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¡¤ GNU patch¤À¤±¤¬¤³¤Î½ñ¼°¤Îº¹Ê¬¤ò¼«Æ°Åª¤ËŬÍѤ¹¤ë¤³¤È¤¬²Äǽ ¤Ç¤¹¡¥Å¬Àڤ˽èÍý¤¹¤ë¤¿¤á¡¤patch¤ÏÄ̾¾¯¤Ê¤¯¤È¤â¼þ¤ê¤Î»°¹Ô¤ò ɬÍפȤ·¤Þ¤¹¡¥