[PATCH v1] GSSAPI encryption support

Applying: GSSAPI: Improve documentation and tests
Using index info to reconstruct a base tree...
M	doc/src/sgml/protocol.sgml
M	src/interfaces/libpq/fe-connect.c
M	src/test/kerberos/t/001_auth.pl
A	src/test/kerberos/t/002_enc.pl
Falling back to patching base and 3-way merge...
Auto-merging src/test/kerberos/t/001_auth.pl
CONFLICT (content): Merge conflict in src/test/kerberos/t/001_auth.pl
Auto-merging src/interfaces/libpq/fe-connect.c
CONFLICT (content): Merge conflict in src/interfaces/libpq/fe-connect.c
Auto-merging doc/src/sgml/protocol.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/protocol.sgml
Patch failed at 0001 GSSAPI: Improve documentation and tests

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"