Ltree syntax improvement

Applying: Ltree syntax improvements
Using index info to reconstruct a base tree...
M	contrib/ltree/expected/ltree.out
M	contrib/ltree/ltree.h
M	contrib/ltree/ltree_io.c
M	contrib/ltree/ltxtquery_io.c
M	contrib/ltree/sql/ltree.sql
M	doc/src/sgml/ltree.sgml
Falling back to patching base and 3-way merge...
Auto-merging doc/src/sgml/ltree.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/ltree.sgml
Auto-merging contrib/ltree/sql/ltree.sql
CONFLICT (content): Merge conflict in contrib/ltree/sql/ltree.sql
Auto-merging contrib/ltree/ltxtquery_io.c
CONFLICT (content): Merge conflict in contrib/ltree/ltxtquery_io.c
Auto-merging contrib/ltree/ltree_io.c
CONFLICT (content): Merge conflict in contrib/ltree/ltree_io.c
Auto-merging contrib/ltree/ltree.h
CONFLICT (content): Merge conflict in contrib/ltree/ltree.h
Auto-merging contrib/ltree/expected/ltree.out
CONFLICT (content): Merge conflict in contrib/ltree/expected/ltree.out
Patch failed at 0001 Ltree syntax improvements

/ci/repo/worktrees/worktree/rebase-apply/patch:1912: trailing whitespace.
					
/ci/repo/worktrees/worktree/rebase-apply/patch:2688: trailing whitespace.
   less than 256 characters long. Label may contain any character supported 
/ci/repo/worktrees/worktree/rebase-apply/patch:2691: trailing whitespace.
   underscores, they should be <firstterm>escaped</firstterm>. 
/ci/repo/worktrees/worktree/rebase-apply/patch:2692: trailing whitespace.
   Escaping can be done with either by a preceding backslash (<literal>\\</literal>) 
/ci/repo/worktrees/worktree/rebase-apply/patch:2693: trailing whitespace.
   symbol or by wrapping the whole label in double quotes (<literal>"</literal>). 
warning: squelched 3 whitespace errors
warning: 8 lines add whitespace errors.
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"