Mercurial > hg > CbC > CbC_gcc

view gcc/testsuite/g++.dg/conflict-markers-2.C @ 145:1830386684a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gcc-9.2.0
author anatofuz
date Thu, 13 Feb 2020 11:34:05 +0900
parents 84e7813d76e9
children
line wrap: on
line source

// { dg-do compile { target c++11 } }

extern void f1 (void);
extern void f2 (void);
extern void f3 (void);
extern void f4 (void);

void test ()
{
  f1 ();
<<<<<<< HEAD // { dg-error "conflict marker" }
  f2 ();
======= // { dg-error "conflict marker" }
  f3 ();
>>>>>>> 252be53... Some commit message // { dg-error "conflict marker" }
  f4 ();
}