Next: , Up: Unified Format   [Contents][Index]


2.3.2.1 °ìÂ⽤·¤¿½ñ¼°¤Î¾ÜºÙ¤Êµ­½Ò

°ìÂ⽤·¤¿½ÐÎϽñ¼°¤ÏÆó¹Ô¤Î¥Ø¥Ã¥À¤Ç³«»Ï¤µ¤ì¡¤¤½¤ì¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡¥

--- from-file from-file-modification-time
+++ to-file to-file-modification-time

¥¿¥¤¥à¥¹¥¿¥ó¥×¤Ï¡¤ÆüÉÕ¡¤Í­Íý¿ô¤ÎÉäò»ÈÍѤ·¤¿»þ´Ö¡¤¤½¤·¤Æ Internet RFC 2822 format ¤Î¥¿¥¤¥à¥¾¡¼¥ó¤ò¼¨¤¹¤¿¤á‘2002-02-21 23:30:39.942229878 -0800’¤Î¤è¤¦ ¤Ë¤Ê¤ê¤Þ¤¹¡¥

¥Ø¥Ã¥À¤ÎÆâÍÆ¤ò¡¤--label=label¥ª¥×¥·¥ç¥ó¤òÍѤ¤¤ÆÊѹ¹¤¹¤ë¤³ ¤È¤¬²Äǽ¤Ç¤¹¡¥Alternate Names¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡¥

¼¡¤Ë¡¤º¹°ÛÉôʬ¤Îhunk¤¬°ì¤Ä°Ê¾å³¤­¤Þ¤¹¡¥¤½¤ì¤¾¤ì¤Îhunk¤Ï¥Õ¥¡¥¤¥ë¤Îº¹°ÛÉô ʬ¤Î°ì¤Ä¤ÎÎΰè¤òɽ¼¨¤·¤Þ¤¹¡¥°ìÂ⽤·¤¿½ñ¼°¤Îhunk¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡¥

@@ from-file-range to-file-range @@
 line-from-either-file
 line-from-either-file

ξÊý¤Î¥Õ¥¡¥¤¥ë¤Ç¤Î¶¦ÄÌÉôʬ¤Ï¡¤¥¹¥Ú¡¼¥¹Ê¸»ú¤Ç³«»Ï¤µ¤ì¤Þ¤¹¡¥Æó¤Ä¤Î¥Õ¥¡¥¤¥ë ´Ö¤Ç¼ÂºÝ¤Ëº¹¤Î¤¢¤ë¹Ô¤Ë¤Ï¡¤°Ê²¼¤Îº¸Â¦¤ÎÎó¤Ë½ÐÎϤµ¤ì¤Æ¤¤¤ë»Ø¼¨Ê¸»ú¤Î°ì¤Ä¤¬ ¤¢¤ê¤Þ¤¹¡¥

+

ºÇ½é¤Î¥Õ¥¡¥¤¥ë¤Î¡¤¤³¤³¤Ë°ì¹ÔÄɲ䵤ì¤Þ¤·¤¿¡¥

-

ºÇ½é¤Î¥Õ¥¡¥¤¥ë¤«¤é¡¤¤³¤³¤Î°ì¹Ô¤¬ºï½ü¤µ¤ì¤Þ¤·¤¿¡¥