Next: Interactive Merging, Previous: Comparing Three Files, Up: Top [Contents][Index]
Æó¿Í¤Î¿Í¤¬Æ±¤¸¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼¤Ø¤ÎÊѹ¹¤ò¹Ô¤Ê¤Ã¤¿¤È¤¡¤¾×ÆÍ¤·¤Æ¤¤¤ëÉôʬ¤Î
·Ù¹ð¤òÍѤ¤¤Æ¡¤¤ª¸ß¤¤¤ÎÊѹ¹¤ÎξÊý¤ò´Þ¤ó¤Ç¤¤¤ë¥Þ¡¼¥¸¤µ¤ì¤¿½ÐÎϤò
diff3
¤ÇÀ¸À®¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥
»°¤Ä°Ê¾å¤Î¥Õ¥¡¥¤¥ë¤òƱ»þ¤ËÈæ³Ó¤¹¤ë¤¿¤á¤Ë¡¤diff4
¤È
diff5
¤Î¤è¤¦¤Ê̾Á°¤Î¥×¥í¥°¥é¥à¤òÁÛÁü¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¤¬¡¤¼ÂºÝ
¤Ë¤½¤ì¤¬É¬Íפˤʤ뤳¤È¤ÏÌÇ¿¤Ë¤¢¤ê¤Þ¤»¤ó¡¥Æó¤Ä¤ÎÊѹ¹¤ÎÁȤòƱ»þ¤Ë¥Þ¡¼¥¸¤¹
¤ë¤³¤È¤Ç¡¤»°¤Ä°Ê¾å¤Î¥Õ¥¡¥¤¥ë¤ÎÊѹ¹¤ÎÁȤò¥Þ¡¼¥¸¤¹¤ë¤¿¤á¤Ë¡¤
diff3
¤ò»ÈÍѤ¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥
diff3
¤Ç¡¤Æó¤Ä¤Î½¤Àµ¤µ¤ì¤¿¥Ð¡¼¥¸¥ç¥ó¤«¤é¶¦Ä̤ΰÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó
¤ËÊѹ¹¤ò¼è¤ê¹þ¤à¤³¤È¤¬²Äǽ¤Ç¤¹¡¥¤³¤ì¤Ç¡¤Æó¤Ä¤Î¿·¤·¤¤¥Õ¥¡¥¤¥ë¤Ë¸ºß¤¹¤ëÊÑ
¹¹¤µ¤ì¤¿ÁȤò¥Þ¡¼¥¸¤·¤Þ¤¹¡¥ÆóÈÖÌܤΰú¿ô¤È¤·¤Æ¶¦Ä̤ΰÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤ò»ØÄê
¤·¡¤Æó¤Ä¤Î¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤òºÇ½é¤È»°ÈÖÌܤΰú¿ô¤È¤·¤Æ°Ê²¼¤Î¤è¤¦¤Ë»ØÄꤷ¤Æ
¤¯¤À¤µ¤¤¡¥
diff3 mine older yours
¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç¤Ê¤Î¤Ç¡¤°ú¿ô¤Î½çÈÖ¤ò³Ð¤¨¤é¤ì¤ë¤Ç¤·¤ç¤¦¡¥
¤³¤Î¤³¤È¤«¤é¡¤yours¤«¤éolder¤ò¼è¤ê½ü¤¤¤Æ¤½¤Î·ë²Ì¤òmine ¤ËÄɲä·¤¿¤ê¡¤older¤«¤éyours¤Ø¤ÎÊѹ¹¤òmine¤Ë¥Þ¡¼¥¸¤·¤Æ ¤¤¤ë¤È¹Í¤¨¤é¤ì¤ë¤Ç¤·¤ç¤¦¡¥¤³¤Î¥Þ¡¼¥¸¤Ï¡¤¤½¤ì¤¾¤ì¤ÎÊѹ¹¤¬¶á¤¯¤Ë¤¢¤ê¡¤ mine¤Èolder¤Ç¥Þ¥Ã¥Á¤¹¤ë¸Â¤ê¤¦¤Þ¤¯¤¤¤¯¤Ç¤·¤ç¤¦¡¥¤¹¤Ù¤Æ¤Î»°¤Ä ¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤¬°Û¤Ê¤Ã¤Æ¤¤¤ë¤È¤¤ä¡¤older¤À¤±¤¬°Û¤Ê¤Ã¤Æ¤¤¤ë¤È¤¤Ï ¤¦¤Þ¤¯¤¤¤«¤Ê¤¤¤Ç¤·¤ç¤¦¡¥¤³¤ì¤ò¾×ÆÍ(conflict)¤È¸Æ¤ó¤Ç¤¤¤Þ¤¹¡¥»°¤Ä¤Î ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬¤¹¤Ù¤Æ°Û¤Ê¤ë¤È¤¡¤¤³¤Î¾×ÆÍ¤ò¥ª¡¼¥Ð¡¼¥é¥Ã¥×(overlap) ¤È¸Æ¤ó¤Ç¤¤¤Þ¤¹¡¥
diff3
¤Ï¡¤¥ª¡¼¥Ð¡¼¥é¥Ã¥×¤ä¾×ÆÍ¤ò½èÍý¤¹¤ëÊýË¡¤âÄ󶡤·¤Æ¤¤¤Þ¤¹¡¥
¥ª¡¼¥Ð¡¼¥é¥Ã¥×¤ä¾×ÆÍ¤òºï½ü¤·¤¿¤ê¡¤¥ª¡¼¥Ð¡¼¥é¥Ã¥×¤À¤±¤òÁªÂò¤·¤¿¤ê¡¤¾×ÆÍ¤ò
ÆÃ¼ì¤Ê‘<<<<<<<’¤È‘>>>>>>>’¤Î¹Ô¤Ç°õ¤òÉÕ¤±¤¿¤ê¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥
diff3
¤Ç¡¤¥Þ¡¼¥¸¤·¤¿½ÐÎϤòºîÀ®¤¹¤ë¤¿¤á¤ËºÇ½é¤Î¥Õ¥¡¥¤¥ë¤ËŬÍѤ¹
¤ë¤³¤È¤¬²Äǽ¤Êed
¥¹¥¯¥ê¥×¥È¤È¤·¤Æ¡¤¥Þ¡¼¥¸¤·¤¿·ë²Ì¤ò½ÐÎϤ¹¤ë¤³¤È
¤â²Äǽ¤Ç¤¹¡¥¤·¤«¤·¡¤diff3
¤Ç¥Þ¡¼¥¸¤·¤¿½ÐÎϤòľÀÜÀ¸À®¤·¤¿Êý¤¬ÎÉ
¤¤¤Ç¤·¤ç¤¦¡¥¤³¤ì¤Çed
¤ÎÌäÂê¤â²óÈò¤·¤Þ¤¹¡¥
• Which Changes: | Selecting changes to incorporate. | |
• Marking Conflicts: | Marking conflicts. | |
• Bypassing ed: | Generating merged output directly. | |
• Merging Incomplete Lines: | How diff3 merges incomplete lines.
| |
• Saving the Changed File: | Emulating System V behavior. |