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