Mercurial > hg > CbC > CbC_gcc

view gcc/testsuite/c-c++-common/conflict-markers-10.c @ 111:04ced10e8804

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gcc 7
author kono
date Fri, 27 Oct 2017 22:46:09 +0900
parents
children
line wrap: on
line source

/* { dg-options "-fdiagnostics-show-caret" } */

<<<<<<< HEAD /* { dg-error "conflict marker" } */
/* { dg-begin-multiline-output "" }
 <<<<<<< HEAD
 ^~~~~~~
   { dg-end-multiline-output "" } */

extern int some_var;

=======      /* { dg-error "conflict marker" } */
/* { dg-begin-multiline-output "" }
 =======
 ^~~~~~~
   { dg-end-multiline-output "" } */

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" } */
/* { dg-begin-multiline-output "" }
 >>>>>>>
 ^~~~~~~
   { dg-end-multiline-output "" } */