<<<<<<< diff_test.txt john had a little dog ======= george had a little blancmange >>>>>>> 1.3.2.2 its flees got everywhere <<<<<<< diff_test.txt and everywhere that john went the dog was sure to poo ======= and everywhere that george went the blancmange was sure to poo >>>>>>> 1.3.2.2