It looks like this needs a rebase and at a quick glance it looks like more than a trivial conflict. I'll mark it Waiting on Author. Please update it back when it's rebased -- Gregory Stark As Commitfest Manager
pgsql-hackers by date:
Соглашаюсь с условиями обработки персональных данных