Mercurial > hg > CbC > CbC_gcc

view gcc/testsuite/c-c++-common/conflict-markers-1.c @ 131:84e7813d76e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gcc-8.2
author mir3636
date Thu, 25 Oct 2018 07:37:49 +0900
parents 04ced10e8804
children
line wrap: on
line source

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;