124d 216a 3||||||| long-o.txt 4This line is different in yours and mine, but the different in each 5======= 6This line is different in yours and mine, but the best in yours 7>>>>>>> long-y.txt 8. 915a 10<<<<<<< long-m.txt 11. 1211a 13>>>>>>> long-y.txt 14. 1510a 16<<<<<<< long-o.txt 17This line is different in yours and mine, but the same 18======= 19. 208c 21This line is different in yours, much butter 22. 23