DataMuseum.dk

top - metrics - download

    Length: 1643 (0x66b)
    Notes: UNIX file
    Names: »diff3.1«

└─⟦26887b7e0⟧ Bits:30009717 Comet 32 harddisk image
    └─⟦28c352965⟧ »/a« UNIX Filesystem
        └─⟦this⟧ »usr/man/man1/diff3.1« 

Default Hex Dump

0x000…020 72 65 64 20 69 6e 20 63 6f 6e 76 65 72 74 69 6e 67 20 61 20 67 69 76 65 6e 20 72 61 6e 67 65 0a   ┆red in converting a given range ┆
0x020…040 6f 66 20 61 20 67 69 76 65 6e 20 66 69 6c 65 20 74 6f 20 73 6f 6d 65 20 6f 74 68 65 72 20 69 73   ┆of a given file to some other is┆
0x040…060 0a 69 6e 64 69 63 61 74 65 64 20 69 6e 20 6f 6e 65 20 6f 66 20 74 68 65 73 65 20 77 61 79 73 3a   ┆ indicated in one of these ways:┆
0x060…080 0a 2e 54 50 20 31 36 0a 2e 49 42 20 66 20 22 20 3a 20 22 20 6e 31 20 22 20 61 22 0a 54 65 78 74   ┆ .TP 16 .IB f " : " n1 " a" Text┆
0x080…0a0 20 69 73 20 74 6f 20 62 65 20 61 70 70 65 6e 64 65 64 20 61 66 74 65 72 20 6c 69 6e 65 20 6e 75   ┆ is to be appended after line nu┆
0x0a0…0c0 6d 62 65 72 0a 2e 49 20 6e 31 0a 69 6e 20 66 69 6c 65 0a 2e 49 20 66 2c 0a 77 68 65 72 65 0a 2e   ┆mber .I n1 in file .I f, where .┆
0x0c0…0e0 49 20 66 0a 3d 20 31 2c 20 32 2c 20 6f 72 20 33 2e 0a 2e 54 50 20 31 36 0a 2e 49 42 20 66 20 22   ┆I f = 1, 2, or 3. .TP 16 .IB f "┆
0x0e0…100 20 3a 20 22 20 6e 31 20 22 20 2c 20 22 20 6e 32 20 22 20 63 22 0a 54 65 78 74 20 69 73 20 74 6f   ┆ : " n1 " , " n2 " c" Text is to┆
0x100…120 20 62 65 0a 63 68 61 6e 67 65 64 20 69 6e 20 74 68 65 20 72 61 6e 67 65 20 6c 69 6e 65 0a 2e 49   ┆ be changed in the range line .I┆
0x120…140 20 6e 31 0a 74 6f 20 6c 69 6e 65 0a 2e 49 52 20 6e 32 20 2e 0a 49 66 20 0a 2e 49 20 6e 31 0a 3d   ┆ n1 to line .IR n2 . If  .I n1 =┆
0x140…160 0a 2e 49 20 6e 32 2c 0a 74 68 65 20 72 61 6e 67 65 20 6d 61 79 20 62 65 20 61 62 62 72 65 76 69   ┆ .I n2, the range may be abbrevi┆
0x160…180 61 74 65 64 20 74 6f 0a 2e 49 52 20 6e 31 20 2e 0a 2e 50 50 0a 54 68 65 20 6f 72 69 67 69 6e 61   ┆ated to .IR n1 . .PP The origina┆
0x180…1a0 6c 20 63 6f 6e 74 65 6e 74 73 20 6f 66 20 74 68 65 20 72 61 6e 67 65 20 66 6f 6c 6c 6f 77 73 20   ┆l contents of the range follows ┆
0x1a0…1c0 69 6d 6d 65 64 69 61 74 65 6c 79 0a 61 66 74 65 72 20 61 0a 2e 42 20 63 0a 69 6e 64 69 63 61 74   ┆immediately after a .B c indicat┆
0x1c0…1e0 69 6f 6e 2e 0a 57 68 65 6e 20 74 68 65 20 63 6f 6e 74 65 6e 74 73 20 6f 66 20 74 77 6f 0a 66 69   ┆ion. When the contents of two fi┆
0x1e0…200 6c 65 73 20 61 72 65 20 69 64 65 6e 74 69 63 61 6c 2c 20 74 68 65 20 63 6f 6e 74 65 6e 74 73 20   ┆les are identical, the contents ┆
0x200…220 00 01 00 00 5a 2c 03 00 00 00 00 00 04 01 00 00 5a 2d 03 00 00 00 00 00 08 01 00 00 5a 2e 03 00   ┆    Z,          Z-          Z.  ┆
0x220…240 00 00 00 00 0c 01 00 00 5a 2f 03 00 00 00 00 00 10 01 00 00 5a 30 03 00 00 00 00 00 14 01 00 00   ┆        Z/          Z0          ┆
0x240…260 1a 65 00 00 00 00 00 00 1c 00 00 00 5a 31 03 00 00 00 00 00 18 01 00 00 5a 32 03 00 00 00 00 00   ┆ e          Z1          Z2      ┆
0x260…280 1c 01 00 00 5a 33 03 00 00 00 00 00 2c 01 00 00 5a 34 03 00 00 00 00 00 30 01 00 00 5a 35 03 00   ┆    Z3      ,   Z4      0   Z5  ┆
0x280…2a0 00 00 00 00 34 01 00 00 5a 36 03 00 00 00 00 00 38 01 00 00 5a 37 03 00 00 00 00 00 3c 01 00 00   ┆    4   Z6      8   Z7      <   ┆
0x2a0…2c0 5a 38 03 00 00 00 00 00 40 01 00 00 5a 39 03 00 00 00 00 00 44 01 00 00 5a 3a 03 00 00 00 00 00   ┆Z8      @   Z9      D   Z:      ┆
0x2c0…2e0 48 01 00 00 da 65 00 00 00 00 00 00 28 00 00 00 5a 3b 03 00 00 00 00 00 4c 01 00 00 5a 3c 03 00   ┆H   Úe      (   Z;      L   Z<  ┆
0x2e0…300 00 00 00 00 50 01 00 00 da de 01 00 00 00 00 00 34 00 00 00 9a df 01 00 00 00 00 00 40 00 00 00   ┆    P   ÚÞ      4    ß      @   ┆
0x300…320 5a e0 01 00 00 00 00 00 4c 00 00 00 1a e1 01 00 00 00 00 00 78 00 00 00 5a 6d 03 00 00 00 00 00   ┆Zà      L    á      x   Zm      ┆
0x320…340 7c 00 00 00 1b d9 03 00 10 01 00 00 a8 00 00 00 1a 34 04 00 00 00 00 00 2c 01 00 00 9a 36 04 00   ┆|    Ù      ¨    4      ,    6  ┆
0x340…360 00 00 00 00 f8 00 00 00 5a 39 04 00 00 00 00 00 20 01 00 00 9a 3c 04 00 00 00 00 00 54 01 00 00   ┆    ø   Z9           <      T   ┆
0x360…380 5a 3f 04 00 00 00 00 00 5c 00 00 00 1a de 03 00 10 00 00 00 00 00 00 00 db 2e 04 00 00 00 00 00   ┆Z?      \    Þ          Û.      ┆
0x380…3a0 53 00 00 00 da 17 04 00 00 00 00 00 80 01 00 00 da 9e 03 00 10 00 00 00 04 00 00 00 da a0 03 00   ┆S   Ú           Ú           Ú   ┆
0x3a0…3c0 10 00 00 00 58 00 00 00 da 41 04 00 00 00 00 00 78 00 00 00 5a 44 04 00 00 00 00 00 94 00 00 00   ┆    X   ÚA      x   ZD          ┆
0x3c0…3e0 da 6b 01 00 00 00 00 00 e4 01 00 00 db d4 00 00 00 00 00 00 00 00 00 00 da 46 04 00 00 00 00 00   ┆Úk      ä   ÛÔ          ÚF      ┆
0x3e0…400 7c 01 00 00 1b 2a 04 00 00 00 00 00 12 00 00 00 9b 2c 04 00 00 00 00 00 37 00 00 00 9a 48 04 00   ┆|    *           ,      7    H  ┆
0x400…420 6f 66 20 74 68 65 20 6c 6f 77 65 72 2d 6e 75 6d 62 65 72 65 64 0a 66 69 6c 65 20 69 73 20 73 75   ┆of the lower-numbered file is su┆
0x420…440 70 70 72 65 73 73 65 64 2e 0a 2e 50 50 0a 55 6e 64 65 72 20 74 68 65 0a 2e 42 20 5c 2d 65 0a 6f   ┆ppressed. .PP Under the .B \-e o┆
0x440…460 70 74 69 6f 6e 2c 0a 2e 49 20 64 69 66 66 33 0a 70 75 62 6c 69 73 68 65 73 20 61 20 73 63 72 69   ┆ption, .I diff3 publishes a scri┆
0x460…480 70 74 20 66 6f 72 20 74 68 65 20 65 64 69 74 6f 72 0a 2e 49 20 65 64 0a 74 68 61 74 20 77 69 6c   ┆pt for the editor .I ed that wil┆
0x480…4a0 6c 20 69 6e 63 6f 72 70 6f 72 61 74 65 20 69 6e 74 6f 0a 2e 49 20 66 69 6c 65 31 0a 61 6c 6c 20   ┆l incorporate into .I file1 all ┆
0x4a0…4c0 63 68 61 6e 67 65 73 20 62 65 74 77 65 65 6e 0a 2e 49 20 66 69 6c 65 32 0a 61 6e 64 0a 2e 49 20   ┆changes between .I file2 and .I ┆
0x4c0…4e0 66 69 6c 65 33 2c 0a 2e 49 52 20 69 2e 65 20 2e 0a 74 68 65 20 63 68 61 6e 67 65 73 20 74 68 61   ┆file3, .IR i.e . the changes tha┆
0x4e0…500 74 20 6e 6f 72 6d 61 6c 6c 79 20 77 6f 75 6c 64 20 62 65 20 66 6c 61 67 67 65 64 20 3d 3d 3d 3d   ┆t normally would be flagged ====┆
0x500…520 20 61 6e 64 20 3d 3d 3d 3d 33 2e 0a 4f 70 74 69 6f 6e 0a 2e 42 20 5c 2d 78 0a 28 5c 66 42 5c 2d   ┆ and ====3. Option .B \-x (\fB\-┆
0x520…540 33 5c 66 52 29 0a 70 72 6f 64 75 63 65 73 20 61 20 73 63 72 69 70 74 20 74 6f 20 69 6e 63 6f 72   ┆3\fR) produces a script to incor┆
0x540…560 70 6f 72 61 74 65 0a 6f 6e 6c 79 20 63 68 61 6e 67 65 73 20 66 6c 61 67 67 65 64 20 3d 3d 3d 3d   ┆porate only changes flagged ====┆
0x560…580 20 28 3d 3d 3d 3d 33 29 2e 0a 54 68 65 20 66 6f 6c 6c 6f 77 69 6e 67 20 63 6f 6d 6d 61 6e 64 20   ┆ (====3). The following command ┆
0x580…5a0 77 69 6c 6c 20 61 70 70 6c 79 20 74 68 65 20 72 65 73 75 6c 74 69 6e 67 20 73 63 72 69 70 74 20   ┆will apply the resulting script ┆
0x5a0…5c0 74 6f 0a 60 66 69 6c 65 31 27 2e 0a 2e 50 50 0a 2e 74 69 20 31 36 6e 0a 28 63 61 74 20 73 63 72   ┆to `file1'. .PP .ti 16n (cat scr┆
0x5c0…5e0 69 70 74 3b 20 65 63 68 6f 20 5c 27 31 2c 24 70 5c 27 29 20 5c 28 62 76 20 65 64 20 5c 2d 20 66   ┆ipt; echo \'1,$p\') \(bv ed \- f┆
0x5e0…600 69 6c 65 31 0a 2e 53 48 20 46 49 4c 45 53 0a 2f 74 6d 70 2f 64 33 3f 3f 3f 3f 3f 0a 2e 62 72 0a   ┆ile1 .SH FILES /tmp/d3????? .br ┆
0x600…620 2f 75 73 72 2f 6c 69 62 2f 64 69 66 66 33 0a 2e 53 48 20 22 53 45 45 20 41 4c 53 4f 22 0a 64 69   ┆/usr/lib/diff3 .SH "SEE ALSO" di┆
0x620…640 66 66 28 31 29 0a 2e 53 48 20 42 55 47 53 0a 54 65 78 74 20 6c 69 6e 65 73 20 74 68 61 74 20 63   ┆ff(1) .SH BUGS Text lines that c┆
0x640…660 6f 6e 73 69 73 74 20 6f 66 20 61 20 73 69 6e 67 6c 65 20 60 2e 27 20 77 69 6c 6c 0a 64 65 66 65   ┆onsist of a single `.' will defe┆
0x660…66b 61 74 0a 2e 42 20 5c 2d 65 2e 0a                                                                  ┆at .B \-e. ┆