Next: Invoking patch, Previous: Invoking diff, Up: Top [Contents][Index]
diff3
¤Î¸Æ¤Ó½Ð¤·diff3
¥³¥Þ¥ó¥É¤Ï»°¤Ä¤Î¥Õ¥¡¥¤¥ë¤òÈæ³Ó¤·¡¤¤½¤ì¤é¤Îº¹°Û¤Îµ½Ò¤ò½Ð
ÎϤ·¤Þ¤¹¡¥¤½¤Î°ú¿ô¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡¥
diff3 options… mine older yours
Èæ³Ó¤¹¤ë¥Õ¥¡¥¤¥ë¤Ï¡¤mine¡¤older¡¤¤½¤·¤Æyours¤Ç¤¹¡¥¤³¤ì
¤é¤Î»°¤Ä¤Î¥Õ¥¡¥¤¥ë¤Î°ì¤Ä¤Ï-¤¬²Äǽ¤Ç¡¤¤½¤ì¤Ïdiff3
¤Ë¥Õ¥¡
¥¤¥ë¤òɸ½àÆþÎϤ«¤éÆÉ¤ß¹þ¤à¤è¤¦¤ËÅÁ¤¨¤Þ¤¹¡¥
½ªÎ»¥¹¥Æ¡¼¥¿¥¹¤Î0¤Ïdiff3
¤¬À®¸ù¤·¤¿¤³¤È¤ò°ÕÌ£¤·¡¤1¤Ï¾×ÆÍ¤¬¸«¤Ä
¤«¤Ã¤¿¤³¤È¤ò°ÕÌ£¤·¡¤2¤ÏÌäÂ꤬¤¢¤Ã¤¿¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡¥
• diff3 Options: | Summary of options to diff3 .
|