Merge openmp release_80 branch r356034 (effectively, 8.0.0 rc5).

[FreeBSD/FreeBSD.git] / usr.bin / diff3 / tests / 1.txt

This is a more complete test
which multiple lines
and a few typ0s to fix
also I plan to add few lines
    and to remove
other lines