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


3 ÉÔ´°Á´¤Ê¹Ô

ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬²þ¹Ô¤Ç¤Ï¤Ê¤¤Ê¸»ú¤Ç½ª¤ë¤È¤­¡¤ºÇ¸å¤Îʸ»ú¤¬²þ¹Ô¤Ç¤Ï¤Ê¤¤¤Î¤Ç¡¤ ¤½¤ÎºÇ¸å¤Î¹Ô¤ÏÉÔ´°Á´¤Ê¹Ô(incomplete line)¤È¸Æ¤Ð¤ì¤Þ¤¹¡¥¤½¤ì°Ê³°¤Î ¤¹¤Ù¤Æ¤Î¹Ô¤Ï´°Á´¤Ê¹Ô(full lines)¤È¸Æ¤Ð¤ì¡¤²þ¹Ôʸ»ú¤Ç½ª¤ê¤Þ¤¹¡¥¶õÇò (see White Space)¤Îº¹°Û¤¬Ìµ»ë¤µ¤ì¤Ê¤¤¸Â¤ê¡¤ÉÔ´°Á´¤Ê¹Ô¤Ï´°Á´¤Ê¹Ô¤Ë¥Þ¥Ã ¥Á¤·¤Þ¤»¤ó¡¥

ÉÔ´°Á´¤Ê¹Ô¤Ï¡¤‘\’¤Ç³«»Ï¤µ¤ì¤ë¹Ô¤¬Â³¤¯´°Á´¤Ê¹Ô¤Î½ÐÎϤȤϡ¤Ä̾ï¶èÊ̤µ ¤ì¤Þ¤¹¡¥¤·¤«¤·¡¤RCS½ñ¼°(see RCS)¤Ç¤Ï¡¤²þ¹Ô¤â¤½¤ì¤Ë³¤¯¹Ô¤âÍѤ¤ ¤º¡¤ÉÔ´°Á´¤Ê¹Ô¤ò¤½¤Î¤Þ¤Þ½ÐÎϤ·¤Þ¤¹¡¥Ê¤٤¿½ñ¼°¤Ç¤Ï¡¤ÉÔ´°Á´¤Ê¹Ô¤òÄ̾綠¤Î ¤Þ¤Þɽ¼¨¤·¤Þ¤¹¤¬¡¤¾ì¹ç¤Ë¤è¤Ã¤Æ¤Ï¡¤Ãʤΰõ¤È¤·¤Æ‘\’¤ä‘/’¤ò»ÈÍѤ· ¤Þ¤¹¡¥if-then-else¤Î¹Ô¤Î½ñ¼°¤Ï¡¤ÉÔ´°Á´¤Ê¹Ô¤ò‘%L’¤ÇÊÝ»ý¤·¡¤‘%l’ ¤Ç²þ¹Ô¤òÇË´þ¤·¤Þ¤¹¡¥See Line Formats. ºÇ¸å¤Ë¡¤ed¤ÈÁ°ÃÖ ed½ÐÎϽñ¼°¤Ç¤Ï(see Output Formats)¡¤diff¤ÏÉÔ´°Á´ ¤Ê¹Ô¤òɽ¼¨¤¹¤ë¤³¤È¤¬ÉÔ²Äǽ¤Ê¤Î¤Ç¡¤²þ¹Ô¤¬¤¢¤ë¤³¤È¤òÍ׵ᤷ¡¤¥¨¥é¡¼¤òÊó¹ð¤· ¤Þ¤¹¡¥

Î㤨¤Ð¡¤F¤ÈG¤¬£±¥Ð¥¤¥È¤Î¥Õ¥¡¥¤¥ë¤Ç¡¤¤½¤ì¤¾¤ì‘f’¤È ‘g’¤ò´Þ¤ó¤Ç¤¤¤ë¤È²¾Äꤷ¤Þ¤¹¡¥¤½¤·¤Æ¡¤‘diff F G’¤Ï°Ê²¼¤ò½ÐÎϤ· ¤Þ¤¹¡¥

1c1
< f
\ No newline at end of file
---
> g
\ No newline at end of file

(Àµ³Î¤Ê¥á¥Ã¥»¡¼¥¸¤Ï±Ñ¸ì°Ê³°¤Î¥í¥±¡¼¥ë¤È¤Ï°Û¤Ê¤ë¤Ç¤·¤ç¤¦¡¥)‘diff -n F G’¤Ï¡¤²þ¹Ô¤ò¸åÃÖ¤¹¤ë¤³¤È̵¤¯°Ê²¼¤ò½ÐÎϤ·¤Þ¤¹¡¥

d1 1
a1 1
g

diff -e F G’¤Ç¤Ï¡¤Æó¤Ä¤Î¥¨¥é¡¼¤òÊó¹ð¤·¡¤°Ê²¼¤ò½ÐÎϤ·¤Þ¤¹¡¥

1c
g
.