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