|
| 1 | +<table class="Differences DifferencesMerged"> |
| 2 | + <thead> |
| 3 | + <tr> |
| 4 | + <th colspan="2">Merge of Version1 & Version2</th> |
| 5 | + </tr> |
| 6 | + </thead><tbody class="ChangeEqual"><tr> |
| 7 | + <th title="">1</th> |
| 8 | + <td><html></td> |
| 9 | +</tr><tr> |
| 10 | + <th title="">2</th> |
| 11 | + <td> <head></td> |
| 12 | +</tr><tr> |
| 13 | + <th title="">3</th> |
| 14 | + <td> <meta http-equiv="Content-type" content="text/html; charset=utf-8"/></td> |
| 15 | +</tr></tbody><tbody class="ChangeReplace"><tr> |
| 16 | + <th title="">4</th> |
| 17 | + <td> <title>Hello <del>World</del><ins>You</ins>!</title></td> |
| 18 | +</tr></tbody><tbody class="ChangeEqual"><tr> |
| 19 | + <th title="">5</th> |
| 20 | + <td> </head></td> |
| 21 | +</tr><tr> |
| 22 | + <th title="">6</th> |
| 23 | + <td> <body></td> |
| 24 | +</tr><tr> |
| 25 | + <th title="">7</th> |
| 26 | + <td> <h1>This is demo content to show features of the php-diff package.</h1></td> |
| 27 | +</tr></tbody><tbody class="ChangeDelete"></tbody><tbody class="ChangeEqual"><tr> |
| 28 | + <th title="Lines deleted at Version2: |
| 29 | +8: <h2>This line is removed from version2.</h2> |
| 30 | +">*8</th> |
| 31 | + <td> <h2>This line is the same for both versions.</h2></td> |
| 32 | +</tr></tbody><tbody class="ChangeReplace"><tr> |
| 33 | + <th title="">9</th> |
| 34 | + <td> <h2>This line has <del>inline </del><ins></ins>differences between both versions.</h2></td> |
| 35 | +</tr></tbody><tbody class="ChangeEqual"><tr> |
| 36 | + <th title="">10</th> |
| 37 | + <td> <h2>This line is the same for both versions.</h2></td> |
| 38 | +</tr></tbody><tbody class="ChangeReplace"><tr> |
| 39 | + <th title="">11</th> |
| 40 | + <td> <h2>This line also has <del>inl</del><ins>InL</ins>ine differences between both versions.</h2></td> |
| 41 | +</tr></tbody><tbody class="ChangeEqual"><tr> |
| 42 | + <th title="">12</th> |
| 43 | + <td> <h2>This line is the same for both versions.</h2></td> |
| 44 | +</tr></tbody><tbody class="ChangeInsert"><tr> |
| 45 | + <th title="">13</th> |
| 46 | + <td><ins> <h2>This line is added to version2.</h2></ins></td> |
| 47 | +</tr></tbody><tbody class="ChangeEqual"><tr> |
| 48 | + <th title="">14</th> |
| 49 | + <td></td> |
| 50 | +</tr><tr> |
| 51 | + <th title="">15</th> |
| 52 | + <td> <p></td> |
| 53 | +</tr><tr> |
| 54 | + <th title="">16</th> |
| 55 | + <td> It's also compatible with multibyte characters (like Chinese and emoji) as shown below:</td> |
| 56 | +</tr></tbody><tbody class="ChangeReplace"><tr> |
| 57 | + <th title="">17</th> |
| 58 | + <td> 另外我覺得那個評<del>價</del><ins>鑑</ins>的白色櫃子有點沒有必要欸。外觀我就不說了 ,怎麼連空間都那麼狹隘。不過倒是從這個地方看出所謂的“改革”</td> |
| 59 | +</tr><tr> |
| 60 | + <th title="">18</th> |
| 61 | + <td> Do you know what "<del>金槍魚罐頭</del><ins>魚の缶詰</ins>" means in Chinese?</td> |
| 62 | +</tr><tr> |
| 63 | + <th title="">19</th> |
| 64 | + <td> <del>🍏🍎</del><ins>🍎🍏</ins>🙂</td> |
| 65 | +</tr></tbody><tbody class="ChangeEqual"><tr> |
| 66 | + <th title="">20</th> |
| 67 | + <td> </p></td> |
| 68 | +</tr><tr> |
| 69 | + <th title="">21</th> |
| 70 | + <td></td> |
| 71 | +</tr><tr> |
| 72 | + <th title="">22</th> |
| 73 | + <td> <p>Just some lines to demonstrate the collapsing of a block of lines which are the same in both versions.</p></td> |
| 74 | +</tr></tbody><tr> |
| 75 | + <th title="">…</th> |
| 76 | + <td class="Skipped">…</td> |
| 77 | +</tr><tbody class="ChangeEqual"><tr> |
| 78 | + <th title="">25</th> |
| 79 | + <td> <p>Just some lines to demonstrate the collapsing of a block of lines which are the same in both versions.</p></td> |
| 80 | +</tr><tr> |
| 81 | + <th title="">26</th> |
| 82 | + <td> <p>Just some lines to demonstrate the collapsing of a block of lines which are the same in both versions.</p></td> |
| 83 | +</tr><tr> |
| 84 | + <th title="">27</th> |
| 85 | + <td> <p>Just some lines to demonstrate the collapsing of a block of lines which are the same in both versions.</p></td> |
| 86 | +</tr></tbody><tbody class="ChangeReplace"><tr> |
| 87 | + <th title="">28</th> |
| 88 | + <td><del> </del><ins> </ins><h2>This line also has inline differences between both versions. It's the whitespace in front.</h2></td> |
| 89 | +</tr></tbody><tbody class="ChangeEqual"><tr> |
| 90 | + <th title="">29</th> |
| 91 | + <td> <h2>This line is the same for both versions.</h2></td> |
| 92 | +</tr></tbody><tbody class="ChangeReplace"><tr> |
| 93 | + <th title="">30</th> |
| 94 | + <td> <h2>This line also has inline differences between both versions<del>.</del><ins>!</ins></h2></td> |
| 95 | +</tr></tbody><tbody class="ChangeEqual"><tr> |
| 96 | + <th title="">31</th> |
| 97 | + <td> </body></td> |
| 98 | +</tr><tr> |
| 99 | + <th title="">32</th> |
| 100 | + <td></html></td> |
| 101 | +</tr><tr> |
| 102 | + <th title="">33</th> |
| 103 | + <td></td> |
| 104 | +</tr></tbody></table> |
0 commit comments