This is an automated email from the git hooks/post-receive script.
unknown user pushed a change to branch master in repository gcc.
from 0393505 Add missing changelog entry new dbd7938 Better error recovery for merge-conflict markers
The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference.
Summary of changes: gcc/c-family/ChangeLog | 5 ++ gcc/c-family/c-common.h | 4 ++ gcc/c-family/c-lex.c | 26 ++++++++ gcc/c/ChangeLog | 8 +++ gcc/c/c-parser.c | 75 +++++++++++++++++++++++- gcc/cp/ChangeLog | 6 ++ gcc/cp/parser.c | 53 +++++++++++++++++ gcc/testsuite/ChangeLog | 15 +++++ gcc/testsuite/c-c++-common/conflict-markers-1.c | 11 ++++ gcc/testsuite/c-c++-common/conflict-markers-10.c | 25 ++++++++ gcc/testsuite/c-c++-common/conflict-markers-11.c | 14 +++++ gcc/testsuite/c-c++-common/conflict-markers-2.c | 2 + gcc/testsuite/c-c++-common/conflict-markers-3.c | 11 ++++ gcc/testsuite/c-c++-common/conflict-markers-4.c | 11 ++++ gcc/testsuite/c-c++-common/conflict-markers-5.c | 11 ++++ gcc/testsuite/c-c++-common/conflict-markers-6.c | 38 ++++++++++++ gcc/testsuite/c-c++-common/conflict-markers-7.c | 6 ++ gcc/testsuite/c-c++-common/conflict-markers-8.c | 4 ++ gcc/testsuite/c-c++-common/conflict-markers-9.c | 8 +++ gcc/testsuite/g++.dg/conflict-markers-1.C | 13 ++++ 20 files changed, 344 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/c-c++-common/conflict-markers-1.c create mode 100644 gcc/testsuite/c-c++-common/conflict-markers-10.c create mode 100644 gcc/testsuite/c-c++-common/conflict-markers-11.c create mode 100644 gcc/testsuite/c-c++-common/conflict-markers-2.c create mode 100644 gcc/testsuite/c-c++-common/conflict-markers-3.c create mode 100644 gcc/testsuite/c-c++-common/conflict-markers-4.c create mode 100644 gcc/testsuite/c-c++-common/conflict-markers-5.c create mode 100644 gcc/testsuite/c-c++-common/conflict-markers-6.c create mode 100644 gcc/testsuite/c-c++-common/conflict-markers-7.c create mode 100644 gcc/testsuite/c-c++-common/conflict-markers-8.c create mode 100644 gcc/testsuite/c-c++-common/conflict-markers-9.c create mode 100644 gcc/testsuite/g++.dg/conflict-markers-1.C