Linux Certif

Toute la documentation sur la certification Linux LPI

merge

̾¾Î

merge - 3 ¤Ä¤Î¥Õ¥¡¥¤¥ëÊ»¹ç

½ñ¼°

merge [ options ] file1 file2 file3

²òÀâ

merge ¤Ï¡¢ file2 ¤«¤é file3 ¤Ø¤ÎÁ´¤Æ¤ÎÊѹ¹¤ò file1 ¤ËÊ»¹ç¤·¤Þ¤¹¡£ ·ë²Ì¤ÏÉáÄÌ file1 ¤ËÆþ¤ê¤Þ¤¹¡£ merge ¤Ï¡¢¸¶ÈפËÂФ·¤ÆÊÌ¡¹¤Ë»Ü¤·¤¿Êѹ¹¤òÊ»¹ç¤¹¤ë¤Î¤ËÊØÍø¤Ç¤¹¡£ file2 ¤ò¸¶ÈפÀ¤È¤·¡¢ file1 ¤È file3 ¤¬ file2 ¤òÊѹ¹¤·¤¿¥Õ¥¡¥¤¥ë¤È¤·¤Þ¤¹¡£ ¤³¤Î¾ì¹ç merge ¤Ï¡¢Î¾Êý¤ÎÊѹ¹¤òÊ»¹ç¤·¤Þ¤¹¡£

file1 ¤È file3 ¤ÎξÊý¤Ë¶¦Ä̤ιԽ¸¹ç¤ÎÆâÍƤ¬°Û¤Ê¤Ã¤Æ¤¤¤ë»þ¡¢¾×Æͤ¬µ¯¤³¤ê¤Þ¤¹¡£ ¾×Æͤ¬¸«ÉÕ¤«¤Ã¤¿¾ì¹ç¡¢Ä̾ï merge ¤Ï¡¢·Ù¹ð¤ª¤è¤Ó <<<<<<< ¤È >>>>>>> ¤È¤Ç³ç¤Ã¤¿¾×Æͤòɽ¤¹¹Ô¤ò½ÐÎϤ·¤Þ¤¹¡£ ŵ·¿Åª¤Ê¾×Æͤϰʲ¼¤Î¤è¤¦¤Ê¤â¤Î¤Ç¤¹¡£

<<<<<<< file A

lines in file A

=======

lines in file B

>>>>>>> file B

¾×Æͤ¬¤¢¤ë¾ì¹ç¡¢¥æ¡¼¥¶¤Ï·ë²Ì¤òÊÔ½¸¤·¤ÆɬÍ×̵¤¤Êý¤ò¾Ãµî¤·¤Ê¤±¤ì¤Ð ¤Ê¤ê¤Þ¤»¤ó¡£

¥ª¥×¥·¥ç¥ó

-A

diff3 ¤Ë¤è¤Ã¤ÆÄ󶡤µ¤ì¤Æ¤¤¤ì¤Ð¡¢ diff3(1) ¤Î -A ·Á¼°¤ò¤Ä¤«¤Ã¤Æ¾×Æͤò½ÐÎϤ·¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢ file2 ¤«¤é file3 ¤Ø¤ÎÁ´¤Æ¤ÎÊѹ¹¤ò file1 ¤ËÊ»¹ç¤·¡¢¤â¤Ã¤È¤â¾éĹ¤Ê½ÐÎϤò¤·¤Þ¤¹¡£

-E, -e

¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢ -A ¥ª¥×¥·¥ç¥ó¤ËÈæ¤Ù¤Æ¾¯¤Ê¤¤¾ðÊó¤òÀ¸À®¤¹¤ë¤è¤¦¤Ê¾×ÆÍ·Á¼°¤ò»ØÄꤷ¤Þ¤¹¡£ ¾ÜºÙ¤Ï¡¢ diff3(1) ¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£ ¥Ç¥Õ¥©¥ë¥È¤Ï¡¢ -E ¤Ç¤¹¡£ -e ¤ò»ØÄꤹ¤ë¤È¡¢ merge ¤Ï¾×Æͤò·Ù¹ð¤·¤Þ¤»¤ó¡£

-L label

¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢ 3 ²ó¤Þ¤Ç»ØÄê²Äǽ¤Ç¤¢¤ê¡¢ ¾×ÆÍÊó¹ðÃæ¤Î¥Õ¥¡¥¤¥ë̾¤Î¾ì½ê¤Î¥é¥Ù¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ ¤¹¤Ê¤ï¤Á¡¢ merge -L x -L y -L z a b c ¤È¤¹¤ë¤È¡¢¼ÂºÝ¤Ï¥Õ¥¡¥¤¥ë a , b , c ¤«¤é¤Î½ÐÎϤǤ¹¤¬¡¢ ¥Õ¥¡¥¤¥ë x , y , z ¤«¤é¤Ç¤­¤¿¤è¤¦¤Ê½ÐÎϤ¬ºî¤é¤ì¤Þ¤¹¡£

-p

·ë²Ì¤ò file1 ¤Ë¾å½ñ¤­¤¹¤ë¤Î¤Ç¤Ï¤Ê¤¯¡¢ ɸ½à½ÐÎϤ˽ÐÎϤ·¤Þ¤¹¡£

-q

ÄÀÌۥ⡼¥É¡£¾×ÆͤËÂФ·¤Æ·Ù¹ð¤ò½Ð¤·¤Þ¤»¤ó¡£

-V

RCS ¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ò½ÐÎϤ·¤Þ¤¹¡£

¿ÇÃÇ

¾×Æͤ¬Ìµ¤¤¾ì¹ç¤Ë¤Ï¡¢ 0 ¤Ç½ªÎ»¤·¤Þ¤¹¡£ 1 ¤Ç½ªÎ»¤·¤¿¾ì¹ç¤Ï¤¤¤¯¤Ä¤«¤Î¾×Æͤ¬¤¢¤ê¡¢ 2 ¤Ï²¿¤«ÌäÂ꤬¤ª¤³¤Ã¤¿¤³¤È¤ò ¤¢¤é¤ï¤·¤Þ¤¹¡£

ºî¼Ô

Author: Walter F. Tichy.
Manual Page Revision: 1.6; Release Date: 1999/08/27.
Copyright © 1982, 1988, 1989 Walter F. Tichy.
Copyright © 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert.

´ØÏ¢¹àÌÜ

diff3(1), diff(1), rcsmerge(1), co(1).

¥Ð¥°

¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤ÎÍͤˡ¢¥Ð¥¤¥Ê¥ê¥Õ¥¡¥¤¥ë¤òÊ»¹ç¤¹¤ë¤³¤È¤Ï¡¢ ÉáÄ̤Ǥ­¤Þ¤»¤ó¡£ ¤·¤«¤·¡¢ merge ¤Ï²¿¤¬¤Ê¤ó¤Ç¤â¹Ô¤ª¤¦¤È¤·¤Þ¤¹¡£