AT&T UNIX™PC Unix System V Users Manual - tenox
AT&T UNIX™PC Unix System V Users Manual - tenox AT&T UNIX™PC Unix System V Users Manual - tenox
DIFF3 ( 1 ) DIFF3 (1) NAME diff3 - 3-way differential file comparison SYNOPSIS diff3 [ -ex3 ] file1 file2 file3 DESCRIPTION Diff9 compares three versions of a file, and publishes disagreeing ranges of text flagged with these codes: ==== all three files differ ====1 filet is different ====2 file2 is different ====3 file9 is different The type of change suffered in converting a given range of a given file to some other is indicated in one of these ways: I : nl a Text is to be appended after line number nt in file I, where I = 1, 2, or 3. I: nt , n2 c Text is to be changed in the range line nt to line n2. If nt = n 2, the range may be abbreviated to nt . The original contents of the range follows immediately after a c indication. When the contents of two files are identical, the contents of the lower-numbered file is suppressed. Under the -e option, diff9 publishes a script for the editor ed that will incorporate into filet all changes between file2 and file9, i.e., the changes that normally would be flagged ==== and ====3. Option -x ( -3) produces a script to incorporate only changes flagged ==== ( ====3). The following command will apply the resulting script to filet . (cat script; echo 11,$p1) 1 ed - file1 Fll..ES jtmp/d3* fusr /lib/ diff3prog SEE ALSO difl(1). BUGS Text lines that consist of a single • will defeat -e. Files longer than 64K bytes won't work. - 1-
- Page 236 and 237: I I I I I I I I I I I I I I I I I I
- Page 238 and 239: COL(l) COL(l) BUGS Cannot back up m
- Page 240 and 241: COMB(l) COMB(l) FIT..ES s.COMB The
- Page 243 and 244: CP ( 1) CP ( 1) NAME cp, In, mv - c
- Page 245 and 246: CPIO ( 1 ) CPIO ( 1) NAME cpio - co
- Page 247: CPIO ( 1) CPIO ( 1) track of them a
- Page 250 and 251: CPP ( 1) CPP (1) Two special names
- Page 253 and 254: CRYPT { l ) ( Domestic Version Only
- Page 255 and 256: CSPLIT ( 1) CSPLIT (l) NAME csplit
- Page 257 and 258: CU ( lC ) CU ( lC ) NAME cu - call
- Page 259: CU(lC) CU ( lC ) BUGS Cu buffers in
- Page 262 and 263: CUT ( 1) CUT(l) DIAGNOSTICS line to
- Page 264 and 265: CW(l) CW (l) .OW Start of text to b
- Page 266 and 267: CW (l) CW (l) Documents that contai
- Page 268 and 269: .� .• \ __ }
- Page 270 and 271: DATE(l) DATE(l) DIAGNOSTICS No perm
- Page 272 and 273: DC( 1) DC (1) x =x The top two elem
- Page 275 and 276: DD ( 1 ) DD ( 1) NAME dd - convert
- Page 277 and 278: � I DELTA ( l ) DELTA (I) NAME de
- Page 279 and 280: DELTA ( 1) DELTA (!) WARNINGS Lines
- Page 281: DEROFF (l) DEROFF (l) NAME derofi -
- Page 284 and 285: DIFF ( 1) DIFF ( 1) -e producing a
- Page 289: DIFFMK ( 1) DIFFMK(l) NAME diffmk -
- Page 293: DU ( l ) DU ( l ) NAME du - summari
- Page 296 and 297: DUMP(l) DUMP (l) -z name,number Dum
- Page 299 and 300: ED (1) ED (I) NAME ed, red - text e
- Page 301 and 302: � I ED ( 1) ED (1) 2.3 A one-char
- Page 303 and 304: ED ( 1 ) ED (1) The append command
- Page 305 and 306: ED ( 1 ) ED ( 1) octal, and long li
- Page 307 and 308: ED (l) ED (1) currently-remembered
- Page 309: ENABLE ( I ) ENABLE (!) NAME enable
- Page 313 and 314: EQN ( 1 ) EQN(l) NAME eqn, neqn, ch
- Page 315 and 316: EQN(l) EQN(l) SEE ALSO Typesetting
- Page 317 and 318: EX ( 1) EX ( 1) NAME ex, edit - tex
- Page 319 and 320: EXPR ( I ) EXPR ( I ) NAME expr - e
- Page 321: FACTOR ( l ) FACTOR ( ! ) NAME fact
- Page 324 and 325: � ,_ .J -� · ·.... ._. . n ·
- Page 327 and 328: FIND ( 1 ) FIND (1) NAME find - fin
- Page 329 and 330: GET(l) GET(l) NAME get - get a vers
- Page 331 and 332: GET(l) -n GET(l) line in the sees f
- Page 333 and 334: GET ( 1) GET(I) IDENTIFICATION KEYW
- Page 335: GET(l) GET(l) same protection restr
DIFF3 ( 1 ) DIFF3 (1)<br />
NAME<br />
diff3 - 3-way differential file comparison<br />
SYNOPSIS<br />
diff3 [ -ex3 ] file1 file2 file3<br />
DESCRIPTION<br />
Diff9 compares three versions of a file, and publishes disagreeing<br />
ranges of text flagged with these codes:<br />
==== all three files differ<br />
====1 filet is different<br />
====2 file2 is different<br />
====3 file9 is different<br />
The type of change suffered in converting a given range of a given<br />
file to some other is indicated in one of these ways:<br />
I : nl a Text is to be appended after line<br />
number nt in file I, where I = 1, 2, or<br />
3.<br />
I: nt , n2 c Text is to be changed in the range line<br />
nt to line n2. If nt = n 2, the range<br />
may be abbreviated to nt .<br />
The original contents of the range follows immediately after a c<br />
indication. When the contents of two files are identical, the contents<br />
of the lower-numbered file is suppressed.<br />
Under the -e option, diff9 publishes a script for the editor ed<br />
that will incorporate into filet all changes between file2 and file9,<br />
i.e., the changes that normally would be flagged ==== and<br />
====3. Option -x ( -3) produces a script to incorporate only<br />
changes flagged ==== ( ====3). The following command<br />
will apply the resulting script to filet .<br />
(cat script; echo 11,$p1) 1 ed - file1<br />
Fll..ES<br />
jtmp/d3*<br />
fusr /lib/ diff3prog<br />
SEE ALSO<br />
difl(1).<br />
BUGS<br />
Text lines that consist of a single • will defeat -e.<br />
Files longer than 64K bytes won't work.<br />
- 1-