xref: /freebsd/usr.bin/diff3/tests/9.out (revision 59c8e88e72633afbc47a4ace0d2170d00d51f7dc)
1This is a more complete test
2<<<<<<< 1
3which multiple lines
4and a few typ0s to fix
5||||||| 2
6which multiple lines
7and a few typos to fix
8=======
9and a few typ0s to fix
10>>>>>>> 3
11also I plan to add few lines
12<<<<<<< 2
13New line
14=======
15>>>>>>> 3
16    and to remove
17other lines
18