Server for Information Technologies EEE
K SAEEZEMEE/a>
(095) 932-9212, 932-9213, 939-0783
E-mail: info@citforum.ru
E E(!) EE CIT Forum CD-ROM

MERGE(1)


merge - @DGE EDGE ZE E EE CM EEECE RCS 

    merge [] ?-E ?-E ?-E


K merge E E E K EDG?, EEE E A, @E EE . E EE E E EE?ELD C EE EE E E EE E EE. -j EECEco .

E??, EE EDG? CMEM ABE EE EE CGE E E EE EBE E E A. K merge @ ?EE EEE II, EEEEEE EE D EE @M EEEG?E <<<<<<< E>>>>>>>. ME@GE?EE 

          <<<<<<< ?-E
          E EBEE
          =======
          E E E
          >>>>>>> ?-E

JEA? EEE CEAEEER?, EEEEEE.


-A EEECE diff3(1) EEEE E -A , @G? ?? M E?EE BE E EDGEEC EH E AH, E E E EE EE ?E E? E@R? E. E diff3 CE EE GNU ?E E, E?E EE EEE E RCS EEEE, E EEE M ? E E
-E, -e E?EE@GEEEGEEDGE EDEE@ZE E-A. сE diff3(1) . ρEJG? EEE -E. ԁEE -e D EE GEEE E.
-L label ԁEEEE EEE EE ?, EEE EEM E @G?E CE EE EECE 
        merge -L x -L y -L z a b c
generates output that looks like it came from files x, y and z instead of from files a, b and c.
-p[rev] E EE D E E , E E ZEE
-q[rev] @G? E???. JE? E ME E.
-V BEMEE RCS ZEE


FE@LH E0 E DEEI, 1 E DEEE@EE, EEE EBEE?E E EE, E2 E EE EEZ ? .

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

Walter F. Tichy, RCS--A System for Version Control, Software--Practice & Experience 15, 7 (July 1985), 637-654.

Copyright (C) Walter F. Tichy, Paul Eggert.


E E E GE E M EE D BE.
Comments: info@citmgu.ru
Designed by Andrey Novikov
Copyright © CIT