Disallow outer-level and WHERE-clause aggregates in GRAPH_TABLE

Applying: Rework GRAPH_TABLE aggregate/window/SRF rejection using ParseExprKind.
Using index info to reconstruct a base tree...
M	src/backend/optimizer/util/var.c
M	src/backend/parser/parse_agg.c
M	src/backend/parser/parse_clause.c
M	src/backend/parser/parse_expr.c
M	src/backend/parser/parse_func.c
A	src/backend/parser/parse_graphtable.c
A	src/backend/rewrite/rewriteGraphTable.c
M	src/backend/rewrite/rewriteManip.c
M	src/include/nodes/primnodes.h
M	src/include/parser/parse_node.h
A	src/test/regress/expected/graph_table.out
A	src/test/regress/sql/graph_table.sql
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): src/test/regress/sql/graph_table.sql deleted in HEAD and modified in Rework GRAPH_TABLE aggregate/window/SRF rejection using ParseExprKind.. Version Rework GRAPH_TABLE aggregate/window/SRF rejection using ParseExprKind. of src/test/regress/sql/graph_table.sql left in tree.
CONFLICT (modify/delete): src/test/regress/expected/graph_table.out deleted in HEAD and modified in Rework GRAPH_TABLE aggregate/window/SRF rejection using ParseExprKind.. Version Rework GRAPH_TABLE aggregate/window/SRF rejection using ParseExprKind. of src/test/regress/expected/graph_table.out left in tree.
Auto-merging src/include/parser/parse_node.h
CONFLICT (content): Merge conflict in src/include/parser/parse_node.h
Auto-merging src/include/nodes/primnodes.h
CONFLICT (content): Merge conflict in src/include/nodes/primnodes.h
Auto-merging src/backend/rewrite/rewriteManip.c
CONFLICT (modify/delete): src/backend/rewrite/rewriteGraphTable.c deleted in HEAD and modified in Rework GRAPH_TABLE aggregate/window/SRF rejection using ParseExprKind.. Version Rework GRAPH_TABLE aggregate/window/SRF rejection using ParseExprKind. of src/backend/rewrite/rewriteGraphTable.c left in tree.
CONFLICT (modify/delete): src/backend/parser/parse_graphtable.c deleted in HEAD and modified in Rework GRAPH_TABLE aggregate/window/SRF rejection using ParseExprKind.. Version Rework GRAPH_TABLE aggregate/window/SRF rejection using ParseExprKind. of src/backend/parser/parse_graphtable.c left in tree.
Auto-merging src/backend/parser/parse_func.c
CONFLICT (content): Merge conflict in src/backend/parser/parse_func.c
Auto-merging src/backend/parser/parse_expr.c
CONFLICT (content): Merge conflict in src/backend/parser/parse_expr.c
Auto-merging src/backend/parser/parse_clause.c
CONFLICT (content): Merge conflict in src/backend/parser/parse_clause.c
Auto-merging src/backend/parser/parse_agg.c
CONFLICT (content): Merge conflict in src/backend/parser/parse_agg.c
Auto-merging src/backend/optimizer/util/var.c
Patch failed at 0001 Rework GRAPH_TABLE aggregate/window/SRF rejection using ParseExprKind.

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"