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