|
Generated by diff2html © Yves Bailly, MandrakeSoft S.A. 2001 diff2html is licensed under the GNU GPL. |
| file1.txt | file2.txt | |||
|---|---|---|---|---|
|
25 lines 1182 bytes Last modified : Wed Oct 10 09:06:49 2001 |
27 lines 1245 bytes Last modified : Wed Oct 10 09:06:47 2001 |
|||
| 1 | text text text text text text text text text text text text text | 1 | text text text text text text text text text text text text text | |
| 2 | text text text text text text text text text text text text text | 2 | text text text text text text text text text text text text text | |
| 3 | this line will be modified | 3 | this line will be (**this is the modif**) modified | |
| 4 | text text text text text text text text text text text text text | |||
| 4 | text text text text text text text text text text text text text | 5 | text text text text text text text text text text text text text | |
| 5 | text text text text text text text text text text text text text | |||
| 6 | the next line will be removed | 6 | the next line will be removed | |
| 7 | this line will be removed | |||
| 8 | but this one will be kept | 7 | but this one will be kept | |
| 9 | text text text text text text text text text text text text text | 8 | text text text text text text text text text text text text text | |
| 10 | text text text text text text text text text text text text text | 9 | text text text text text text text text text text text text text | |
| 11 | text text text text text text text text text text text text text | 10 | text text text text text text text text text text text text text | |
| 11 | line inserted | |||
| 12 | insert a line before this one | 12 | insert a line before this one | |
| 13 | text text text text text text text text text text text text text | 13 | text text text text text text text text text text text text text | |
| 14 | text text text text text text text text text text text text text | 14 | text text text text text text text text text text text text text | |
| 15 | modified line - 1 | 15 | modified line - 1 ** modif 1 | |
| 16 | modified line - 2 | 16 | modified line - 2 ** modif 2 | |
| 17 | text text text text text text text text text text text text text | 17 | text text text text text text text text text text text text text | |
| 18 | text text text text text text text text text text text text text | 18 | text text text text text text text text text text text text text | |
| 19 | deleted line - 1 | |||
| 20 | deleted line - 2 | |||
| 21 | this line kept | 19 | this line kept | |
| 22 | text text text text text text text text text text text text text | 20 | text text text text text text text text text text text text text | |
| 23 | text text text text text text text text text text text text text | 21 | text text text text text text text text text text text text text | |
| 22 | inserted line 1 | |||
| 23 | inserted line 2 | |||
| 24 | inserted line 3 | |||
| 24 | insert three lines before this one | 25 | insert three lines before this one | |
| 25 | text text text text text text text text text text text text text | 26 | text text text text text text text text text text text text text | |
| 27 | new last line |