Mercurial > hg > CbC > CbC_gcc

diff gcc/testsuite/c-c++-common/conflict-markers-1.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 diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gcc/testsuite/c-c++-common/conflict-markers-1.c	Fri Oct 27 22:46:09 2017 +0900
@@ -0,0 +1,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;