| OLD | NEW |
| 1 You can modify this file to create no-op changelists (like this one). | 1 You can modify this file to create no-op changelists (like this one). |
| 2 I LOVE WHITESPACE! | 2 I LOVE WHITESPACE! |
| 3 Lithp. | 3 Lithp. |
| 4 Use the Forth. | 4 Use the Forth. |
| 5 Life is a mistry. Everyone must WAKA WAKA WAKA | 5 Life is a mistry. Everyone must WAKA WAKA WAKA |
| 6 This file has gotten so boring. | 6 This file has gotten so boring. |
| 7 epoger added this line using a pure git checkout | 7 epoger added this line using a pure git checkout |
| 8 florin was here | 8 florin was here |
| 9 more whitespace | 9 more whitespace |
| 10 trigger android build | 10 trigger android build |
| 11 <<<<<<< ours |
| 12 ======= |
| 13 |
| 14 |
| 15 |
| 16 |
| 17 |
| 18 >>>>>>> theirs |
| OLD | NEW |