Next: , Up: diff3 Merging   [Contents][Index]


8.1 ÁȤ߹þ¤àÊѹ¹¤òÁªÂò¤¹¤ë

mine¤Ë¥Þ¡¼¥¸¤¹¤ë¤¿¤á¤Ë¡¤-e¤ä--ed¤òÍѤ¤¤Æ¡¤ older¤«¤éyours¤Ø¤Î¥Þ¡¼¥¸¤µ¤ì¤Æ¤¤¤Ê¤¤¤¹¤Ù¤Æ¤ÎÊѹ¹¤òÁªÂò¤¹¤ë¤³ ¤È¤¬²Äǽ¤Ç¤¹¡¥-3¤ä--easy-only¤òÍѤ¤¤Æ¡¤¥ª¡¼¥Ð¡¼¥é¥Ã¥× ¤Î¤Ê¤¤¥Þ¡¼¥¸¤µ¤ì¤Æ¤¤¤Ê¤¤Êѹ¹¤À¤±¤òÁªÂò¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¡¤-x¤ä --overlap-only¤òÍѤ¤¤Æ¡¤¥ª¡¼¥Ð¡¼¥é¥Ã¥×¤µ¤ì¤Æ¤¤¤ëÊѹ¹¤À¤±¤òÁªÂò ¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡¥

-e¡¤-3¡¤¤½¤·¤Æ-x¥ª¥×¥·¥ç¥ó¤Ï¡¤¥Þ¡¼¥¸¤µ¤ì ¤Æ¤¤¤Ê¤¤Êѹ¹(unmerged changes)¡¤Î㤨¤Ð¡¤mine¤Èyours¤ÇÊѹ¹¤¬ °Û¤Ê¤ë¤È¤³¤í¤À¤±¤òÁªÂò¤·¤Þ¤¹¡¥mine¤Èyours¤¬Æ±¤¸¤È¤³¤í¤Ç¤Ï¡¤ Êѹ¹Éôʬ¤Ï´û¤Ë¥Þ¡¼¥¸¤µ¤ì¤Æ¤¤¤ë¤È²¾Äꤵ¤ì¤ë¤Î¤Ç¡¤older¤«¤é yours¤Ø¤ÎÊѹ¹¤ò̵»ë¤·¤Þ¤¹¡¥¤³¤Î²¾Ä꤬°ÂÁ´¤Ç¤Ï¤Ê¤¤¾ì¹ç¡¤-A ¤ä--show-all¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹(see Marking Conflicts)¡¥

¤³¤ì¤é»°¤Ä¤Î¥ª¥×¥·¥ç¥ó¤ò¤½¤ì¤¾¤ìÍѤ¤¤¿¥³¥Þ¥ó¥Édiff3¤Î½ÐÎÏÎã¤Ï °Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹(¥Õ¥¡¥¤¥ë¤Î´°Á´¤ÊÆâÍÆ¤Ï¡¤see Sample diff3 Input)¡¥ -e¤Î½ÐÎϤ¬-3¤È-x¤Ç½ÐÎϤµ¤ì¤ëÊѹ¹¤ÎÁȤò¥Ð¥é¤· ¤Æ¹çÂΤµ¤»¤¿¤â¤Î¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡¥

diff3 -e lao tzu tao’¤Î½ÐÎϤǤ¹¡¥

11a

  -- The Way of Lao-Tzu, tr. Wing-tsit Chan
.
8c
  so we may see their result.
.

diff3 -3 lao tzu tao’¤Î½ÐÎϤǤ¹¡¥

8c
  so we may see their result.
.

diff3 -x lao tzu tao’¤Î½ÐÎϤǤ¹¡¥

11a

  -- The Way of Lao-Tzu, tr. Wing-tsit Chan
.