usr.bin/diff3/tests/8.out


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

4a
>>>>>>> 3
.
4a
<<<<<<< 2
New line
=======
.
3a
||||||| 2
which multiple lines
and a few typos to fix
=======
and a few typ0s to fix
>>>>>>> 3
.
1a
<<<<<<< 1
.