]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/blob - usr.bin/diff/tests/group-format.out
MFC r315051, r315101, r315103, r315107, r315180, r315197, r315293, r315319,
[FreeBSD/FreeBSD.git] / usr.bin / diff / tests / group-format.out
1 /*
2  * A comment 
3  *
4 <<<<<<< (local)
5  * And another  bla
6 =======
7  * And another bla
8 >>>>>>> (stock)
9  *
10 <<<<<<< (local)
11  * And yet another
12 =======
13  * and yet another
14 >>>>>>> (stock)
15  */
16
17 int
18 main(void)
19 {
20 <<<<<<< (local)
21 =======
22
23 >>>>>>> (stock)
24         printf("something");
25
26         return (0);
27 }