]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/blob - usr.bin/diff3/tests/4.out
MFV r330102: ntp 4.2.8p11
[FreeBSD/FreeBSD.git] / usr.bin / diff3 / tests / 4.out
1 3a
2 =======
3 and a few typ0s to fix
4 >>>>>>> 3
5 .
6 1a
7 <<<<<<< 1
8 .