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