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