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