Remove inner joins based on foreign keys

Applying: Remove inner joins based on foreign keys
Using index info to reconstruct a base tree...
M	src/backend/optimizer/plan/analyzejoins.c
M	src/backend/utils/cache/relcache.c
M	src/backend/utils/misc/guc_parameters.dat
M	src/backend/utils/misc/postgresql.conf.sample
M	src/include/utils/rel.h
M	src/test/regress/expected/join.out
M	src/test/regress/expected/sysviews.out
M	src/test/regress/sql/join.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/sql/join.sql
Auto-merging src/test/regress/expected/sysviews.out
Auto-merging src/test/regress/expected/join.out
Auto-merging src/include/utils/rel.h
Auto-merging src/backend/utils/misc/postgresql.conf.sample
Auto-merging src/backend/utils/misc/guc_parameters.dat
Auto-merging src/backend/utils/cache/relcache.c
Auto-merging src/backend/optimizer/plan/analyzejoins.c
CONFLICT (content): Merge conflict in src/backend/optimizer/plan/analyzejoins.c
Patch failed at 0001 Remove inner joins based on foreign keys

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"