usr.bin/diff3/tests/9.out


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17

This is a more complete test
<<<<<<< 1
which multiple lines
and a few typ0s to fix
||||||| 2
which multiple lines
and a few typos to fix
=======
and a few typ0s to fix
>>>>>>> 3
also I plan to add few lines
<<<<<<< 2
New line
=======
>>>>>>> 3
    and to remove
other lines