Mercurial > hg > CbC > CbC_gcc
view gcc/testsuite/c-c++-common/conflict-markers-10.c @ 145:1830386684a0
gcc-9.2.0
author | anatofuz |
---|---|
date | Thu, 13 Feb 2020 11:34:05 +0900 |
parents | 04ced10e8804 |
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 "" } */