[PATCH] Remove workarounds to format [u]int64's

Applying: Change some variables to long long from int64
Using index info to reconstruct a base tree...
M	src/backend/commands/copy.c
M	src/backend/commands/copyfrom.c
M	src/backend/commands/copyto.c
M	src/backend/tcop/utility.c
M	src/bin/pg_checksums/pg_checksums.c
M	src/include/commands/copy.h
M	src/include/commands/copyfrom_internal.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/commands/copyfrom_internal.h
Auto-merging src/include/commands/copy.h
Auto-merging src/bin/pg_checksums/pg_checksums.c
CONFLICT (content): Merge conflict in src/bin/pg_checksums/pg_checksums.c
Auto-merging src/backend/tcop/utility.c
Auto-merging src/backend/commands/copyto.c
Auto-merging src/backend/commands/copyfrom.c
CONFLICT (content): Merge conflict in src/backend/commands/copyfrom.c
Auto-merging src/backend/commands/copy.c
Patch failed at 0001 Change some variables to long long from int64

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"