Small improvement to compactify_tuples

Applying: Header for customized qsort.
Using index info to reconstruct a base tree...
M	src/backend/utils/sort/Makefile
A	src/backend/utils/sort/gen_qsort_tuple.pl
M	src/backend/utils/sort/tuplesort.c
M	src/port/qsort.c
M	src/port/qsort_arg.c
A	src/tools/msvc/Solution.pm
A	src/tools/msvc/clean.bat
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): src/tools/msvc/clean.bat deleted in HEAD and modified in Header for customized qsort.. Version Header for customized qsort. of src/tools/msvc/clean.bat left in tree.
CONFLICT (modify/delete): src/tools/msvc/Solution.pm deleted in HEAD and modified in Header for customized qsort.. Version Header for customized qsort. of src/tools/msvc/Solution.pm left in tree.
Auto-merging src/port/qsort_arg.c
CONFLICT (content): Merge conflict in src/port/qsort_arg.c
Auto-merging src/port/qsort.c
CONFLICT (content): Merge conflict in src/port/qsort.c
Auto-merging src/backend/utils/sort/tuplesort.c
CONFLICT (content): Merge conflict in src/backend/utils/sort/tuplesort.c
Auto-merging src/backend/utils/sort/Makefile
CONFLICT (content): Merge conflict in src/backend/utils/sort/Makefile
Patch failed at 0001 Header for customized qsort.

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"