Next: Merging with patch, Previous: diff3 Merging, Up: Top [Contents][Index]
sdiff
¤òÍѤ¤¤¿ÂÐÏÃŪ¤Ê¥Þ¡¼¥¸sdiff
¤òÍѤ¤¤ë¤È¡¤²£¤Ëʤ٤¿-y½ñ¼°¤ÎÈæ³Ó¤ò¸µ¤Ë¤·¤Æ
(see Side by Side)¡¤Æó¤Ä¤Î¥Õ¥¡¥¤¥ë¤òÂÐÏÃŪ¤Ë¥Þ¡¼¥¸¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥
¥Þ¡¼¥¸¤µ¤ì¤¿¥Æ¥¥¹¥È¤ò½ñ¤¯¾ì½ê¤ò»ØÄꤹ¤ë¤¿¤á¤Ë¡¤-o file¤ä
--output=file¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡¥sdiff
¤Î¥ª¥×¥·¥ç
¥ó¤Î¾ÜºÙ¤Ï¡¤See Invoking sdiff.
¥Õ¥¡¥¤¥ë¤òÂÐÏÃŪ¤Ë¥Þ¡¼¥¸¤¹¤ë¤â¤¦°ì¤Ä¤ÎÊýË¡¤Ï¡¤Emacs Lisp¥Ñ¥Ã¥±¡¼¥¸¤Î
emerge
¤ò»ÈÍѤ¹¤ëÊýË¡¤Ç¤¹¡¥¾ÜºÙ¤Ï¡¤See emerge in The GNU Emacs Manual.
• sdiff Option Summary: | Summary of sdiff options.
| |
• Merge Commands: | Merging two files interactively. |