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