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