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