File: conflict-markers-1.c

package info (click to toggle)
gcc-arm-none-eabi 15%3A12.2.rel1-1
  • links: PTS, VCS
  • area: main
  • in suites: bookworm
  • size: 959,712 kB
  • sloc: cpp: 3,275,382; ansic: 2,061,766; ada: 840,956; f90: 208,513; makefile: 76,132; asm: 73,433; xml: 50,448; exp: 34,146; sh: 32,436; objc: 15,637; fortran: 14,012; python: 11,991; pascal: 6,787; awk: 4,779; perl: 3,054; yacc: 338; ml: 285; lex: 201; haskell: 122
file content (11 lines) | stat: -rw-r--r-- 357 bytes parent folder | download | duplicates (6) 
1
2
3
4
5
6
7
8
9
10
11
 
int p;

<<<<<<< HEAD /* { dg-error "conflict marker" } */
extern int some_var;
=======      /* { dg-error "conflict marker" } */
extern short some_var; /* This line would lead to a warning due to the
			  duplicate name, but it is skipped when handling
			  the conflict marker.  */
>>>>>>> Some commit message  /* { dg-error "conflict marker" } */

int q;