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