blob: e29d3eb526b082c2a19f2d219720717431425f35 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
<<<<<<< blah.c
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
/* a comment */
/* main function */
int
main(int argc, char **argv)
{
printf("foo bar\n");
return (0);
}
=======
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
/* a comment */
/* main function */
int
main(int argc, char **argv)
{
printf("foo bar\n");
return (0);
}
>>>>>>> 1.3
|
