Next: , Previous: Context, Up: Output Formats   [Contents][Index]


2.4 º¹°Û¤òʤ٤ÆÉ½¼¨¤¹¤ë

diff¤Ç¤Ï¡¤Æó¤Ä¤Î¥Õ¥¡¥¤¥ë¤Îº¹°Û¤Î¥ê¥¹¥È¤òʤ٤ÆÀ¸À®¤¹¤ë¤³¤È¤¬²Ä ǽ¤Ç¤¹¡¥½ÄÃÊÍî´Ö¤Î¹Â¤òÍѤ¤¤Æ¥Õ¥¡¥¤¥ë¤ÏÆóÎó¤Ë¥ê¥¹¥È¥¢¥Ã¥×¤µ¤ì¤Þ¤¹¡¥½ÄÃÊÍî ´Ö¤Î¹Â¤Ï°Ê²¼¤Î¥Þ¡¼¥«¤Î°ì¤Ä¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡¥

white space

¶¦Ä̤ÎÂбþ¤¹¤ë¹Ô¤Ç¤¹¡¥¤¹¤Ê¤ï¤Á¡¤¤½¤ì¤¾¤ì¤Î¹Ô¤ÏƱ¤¸¡¤¤Þ¤¿¤Ï --ignore¥ª¥×¥·¥ç¥ó(see White Space)¤Î°ì¤Ä¤Ç̵»ë¤µ¤ì¤Æ¤¤¤ëº¹ ¤·¤«¤¢¤ê¤Þ¤»¤ó¡¥

|

Âбþ¤¹¤ë¹Ô¤Ëº¹¤¬¤¢¤ê¡¤Î¾Êý¤È¤â´°Á´¤Þ¤¿¤ÏξÊý¤È¤âÉÔ´°Á´¤Ç¤¹¡¥

<

¥Õ¥¡¥¤¥ë¤Ëº¹¤¬¤¢¤ê¡¤ºÇ½é¤Î¥Õ¥¡¥¤¥ë¤À¤±¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¹Ô¤Ç¤¹¡¥

>

¥Õ¥¡¥¤¥ë¤Ëº¹¤¬¤¢¤ê¡¤ÆóÈÖÌܤΥե¡¥¤¥ë¤À¤±¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¹Ô¤Ç¤¹¡¥

(

ºÇ½é¤Î¥Õ¥¡¥¤¥ë¤À¤±¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¹Ô¤Ç¤¹¤¬¡¤º¹°Û¤Ï̵»ë¤µ¤ì¤Þ¤¹¡¥

)

ÆóÈÖÌܤΥե¡¥¤¥ë¤À¤±¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¹Ô¤Ç¤¹¤¬¡¤º¹°Û¤Ï̵»ë¤µ¤ì¤Þ¤¹¡¥

\

Âбþ¤¹¤ë¹Ô¤Ëº¹¤¬¤¢¤ê¡¤ºÇ½é¤Î¥Õ¥¡¥¤¥ë¤Î¹Ô¤Î¤ß¤¬ÉÔ´°Á´¤Ç¤¹¡¥

/

Âбþ¤¹¤ë¹Ô¤Ëº¹¤¬¤¢¤ê¡¤ÆóÈÖÌܤΥե¡¥¤¥ë¤Î¹Ô¤Î¤ß¤¬ÉÔ´°Á´¤Ç¤¹¡¥

Ä̾ï½ÐÎϹԤϡ¤¤½¤ì¤ÏÉÔ´°Á´¤Ê¹Ô¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¤À¤±ÉÔ´°Á´¤Ç¤¹¡¥ See Incomplete Lines. ¤·¤«¤·¡¤½ÐÎϹԤ¬Æó¤Ä¤Îº¹°Û¤Î¤¢¤ë¹Ô¤Ëɽ¼¨¤µ¤ì¤ë ¤È¤­¡¤°ìÊý¤ÏÉÔ´°Á´¤Ç¤â¤¦°ìÊý¤Ï¤½¤¦¤Ç¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡¥¤³¤Î¾õ¶·¤Ç¤Ï¡¤½Ð ÎϹԤϴ°Á´¤Ç¤¹¤¬¡¤¤½¤Î½ÄÃÊÍî´Ö¤Î¹Â¤Ï¡¤ºÇ½é¤Î¹Ô¤¬ÉÔ´°Á´¤Ê¾ì¹ç¤Ï‘\’ ¤Ç¡¤ÆóÈÖÌܤιԤ¬ÉÔ´°Á´¤Ê¾ì¹ç¤Ï‘/’¤Ç°õ¤¬ÉÕ¤¤¤Æ¤¤¤Þ¤¹¡¥

ʤ٤¿½ñ¼°¤¬ºÇ¤âÆÉ¤ß°×¤¤¤È¤­¤â¤¢¤ê¤Þ¤¹¤¬¡¤¤½¤ì¤Ë¤ÏÀ©¸Â¤¬¤¢¤ê¤Þ¤¹¡¥¤½¤ì¤Ï Ä̾ï¤è¤ê¤Ï¤ë¤«¤ËÉý¹­¤Î½ÐÎϤòÀ¸À®¤·¡¤Ä¹²á¤®¤ë¤ÈÀÚ¤êµÍ¤á¤é¤ì¤Þ¤¹¡¥¤Þ¤¿¡¤ÄÌ ¾ï¤è¤ê½ÐÎϤÎÀ°Îó¾õÂ֤˶¯¤¯°Í¸¤¹¤ë¤Î¤Ç¡¤²ÄÊÑÉý¥Õ¥©¥ó¥È¡¤É¸½àŪ¤Ç¤Ï¤Ê¤¤¥¿ ¥Ö¥¹¥È¥Ã¥×¡¤¤Þ¤¿¤Ïɽ¼¨ÉÔ²Äǽ¤Êʸ»ú¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¡¤¤½¤Î½ÐÎÏ¤ÏÆÃ¤Ë¸«±É ¤¨¤¬°­¤¯¤Ê¤ê¤Þ¤¹¡¥

ʤ٤¿º¹°Û¤òÂÐÏÃŪ¤Ë¥Þ¡¼¥¸¤¹¤ë¤¿¤á¤Ë¡¤sdiff¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ë ¤³¤È¤â²Äǽ¤Ç¤¹¡¥¥Õ¥¡¥¤¥ë¤Î¥Þ¡¼¥¸¤Î¾ÜºÙ¤Ï¡¤See Interactive Merging.