Next: Merge Commands, Up: Interactive Merging [Contents][Index]
sdiff
¤Ëdiff
¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë°Ê²¼¤Îsdiff
¤Ï¡¤diff
¤ÈƱ¤¸°ÕÌ£¤Ç¤¹¡¥¤³¤ì¤é¤Î¥ª¥×¥·¥ç
¥ó¤Î»ÈÍѤˤĤ¤¤Æ¤Ï¡¤See diff Options.
-a -b -d -i -t -v -B -E -I regexp --ignore-blank-lines --ignore-case --ignore-matching-lines=regexp --ignore-space-change --ignore-tab-expansion --left-column --minimal --speed-large-files --strip-trailing-cr --suppress-common-lines --expand-tabs --text --version --width=columns
Îò»ËŪ¤ÊÍýͳ¤«¤é¡¤sdiff
¤ÏÊÌ̾¤Î¤¢¤ë¥ª¥×¥·¥ç¥ó¤â¤¢¤ê¤Þ¤¹¡¥
-l¤Ï--left-column¥ª¥×¥·¥ç¥ó¤ÈÅù²Á¤Ç¡¤Æ±Íͤˡ¤
-s¤Ï--suppress-common-lines¤ÈÅù²Á¤Ç¤¹¡¥sdiff
¤Î-w¤È-W¥ª¥×¥·¥ç¥ó¤Î°ÕÌ£¤Ï¡¤diff
¤È¤Ï°ã¤¤¤Þ¤¹¡¥
sdiff
¤Ç¤Ï¡¤-w columns¤Ï
--width=columns¤ÈÅù²Á¤Ç¡¤-W¤Ï
--ignore-all-space¤ÈÅù²Á¤Ç¤¹¡¥-o¥ª¥×¥·¥ç¥ó¤òÍѤ¤¤Ê¤¤
sdiff
¤Ï¡¤-y¤ä--side-by-side¥ª¥×¥·¥ç¥ó
(see Side by Side)¤òÍѤ¤¤¿diff
¤ÈÅù²Á¤Ç¤¹¡¥