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