Next: Saving the Changed File, Previous: Bypassing ed, Up: diff3 Merging [Contents][Index]
diff3
¤¬¥Þ¡¼¥¸¤¹¤ëÊýË¡-m¤òÍѤ¤¤ë¤È¡¤ÉÔ´°Á´¤Ê¹Ô(see Incomplete Lines)¤Ï¸«¤Ä¤«¤Ã¤¿ ¤â¤Î¤È¤·¤Æ¡¤Ã±½ã¤Ë½ÐÎϤ˥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡¥½ÐÎϤνª¤ê¤Ç¾×ÆÍ¤¬¤¢¤ê¡¤ÆþÎÏ¥Õ¥¡ ¥¤¥ë¤Î°ì¤Ä¤¬ÉÔ´°Á´¤Ê¹Ô¤Ç½ª¤ë¾ì¹ç¡¤ÉÔ´°Á´¤Ê¹Ô¤¬Äɲ䵤ì¤ë¤Î¤Ç¡¤ ‘|||||||’¡¤‘=======’¡¤¤Þ¤¿¤Ï‘>>>>>>>’¤ÎÂ祫¥Ã¥³¤Ï¡¤¹Ô¤ÎºÇ ½é¤Ç¤Ï¤Ê¤¤¾ì½ê¤Ë¸½¤ì¤ë¤Ç¤·¤ç¤¦¡¥
-m¥ª¥×¥·¥ç¥ó¤òÍѤ¤¤Ê¤¤¤È¡¤ed
¥¹¥¯¥ê¥×¥È¥ª¥×¥·¥ç¥ó¤¬»Ø
Äꤵ¤ì¤Æ¤¤¤Æ¡¤ÉÔ´°Á´¤Ê¹Ô¤¬¸«¤Ä¤«¤ë¾ì¹ç¡¤diff3
¤Ï·Ù¹ð¤òÀ¸À®¤·¡¤
²þ¹Ô¤¬Â¸ºß¤·¤Ê¤¤¤«¤Î¤è¤¦¤Ëưºî¤·¤Þ¤¹¡¥