Next: , Previous: diff Performance, Up: Top   [Contents][Index]


7 »°¤Ä¤Î¥Õ¥¡¥¤¥ë¤ÎÈæ³Ó

»°¤Ä¤Î¥Õ¥¡¥¤¥ë¤òÈæ³Ó¤·¡¤¤½¤ì¤é¤Î´Ö¤Îº¹°Û¤òɽ¼¨¤¹¤ë¤¿¤á¡¤¥×¥í¥°¥é¥à diff3¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤(diff3¤Ç¥Õ¥¡¥¤¥ë¤Î¥Þ¡¼¥¸¤â²Ä ǽ¤Ç¤¹¡¥see diff3 Merging)¡¥

“Ä̾ï¤Î”diff3¤Î½ÐÎϽñ¼°¤Ï¡¤¼þ¤ê¤Îʸ¤òÍѤ¤¤º¤Ë¡¤¤½¤ì¤¾¤ì¤Îº¹ °ÛÉôʬ¤Îhunk¤òɽ¼¨¤·¤Þ¤¹¡¥hunk¤Ë¤Ï¡¤¤½¤ì¤¬ÆóÊý¸þ¤«»°Êý¸þ¤«¤Ë°Í¸¤·¤Æ¥é¥Ù ¥ë¤¬ÉÕ¤±¤é¤ì¤Æ¤Æ¡¤¹Ô¤Ë¤Ï¡¤ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤ÇÃí¼á¤¬¤Ä¤­¤Þ¤¹¡¥

diff3¤Î¼Â¹ÔÊýË¡¤Î¾ÜºÙ¤Ï¡¤See Invoking diff3.