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