xref: /freebsd/usr.bin/diff3/tests/4.out (revision dd41de95a84d979615a2ef11df6850622bf6184e) 
13a
2=======
3and a few typ0s to fix
4>>>>>>> 3
5.
61a
7<<<<<<< 1
8.
9