blob: ca484deddc2ac99e86b538fa0f1912c3ad94fde0 (
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
32
33
|
<<<<<<< blah.c
/* $Id: rcsmerge.out,v 1.1 2006/03/11 06:22:47 ray Exp $ */
#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);
}
=======
/* $Id: rcsmerge.out,v 1.1 2006/03/11 06:22:47 ray Exp $ */
#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
|
