xref: /freebsd/usr.bin/diff3/tests/9.out (revision d02c951f8ec631d059ec7a8addb8a104cd160280) 
1*e1910ebdSBaptiste DaroussinThis is a more complete test
2*e1910ebdSBaptiste Daroussin<<<<<<< 1
3*e1910ebdSBaptiste Daroussinwhich multiple lines
4*e1910ebdSBaptiste Daroussinand a few typ0s to fix
5*e1910ebdSBaptiste Daroussin||||||| 2
6*e1910ebdSBaptiste Daroussinwhich multiple lines
7*e1910ebdSBaptiste Daroussinand a few typos to fix
8*e1910ebdSBaptiste Daroussin=======
9*e1910ebdSBaptiste Daroussinand a few typ0s to fix
10*e1910ebdSBaptiste Daroussin>>>>>>> 3
11*e1910ebdSBaptiste Daroussinalso I plan to add few lines
12*e1910ebdSBaptiste Daroussin<<<<<<< 2
13*e1910ebdSBaptiste DaroussinNew line
14*e1910ebdSBaptiste Daroussin=======
15*e1910ebdSBaptiste Daroussin>>>>>>> 3
16*e1910ebdSBaptiste Daroussin    and to remove
17*e1910ebdSBaptiste Daroussinother lines
18