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