Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ovatp-0006B4-7k for pgsql-committers@arkaria.postgresql.org; Thu, 17 Nov 2022 09:09:33 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1ovatn-0006bT-OJ for pgsql-committers@arkaria.postgresql.org; Thu, 17 Nov 2022 09:09:31 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ovatn-0006Vy-Fi for pgsql-committers@lists.postgresql.org; Thu, 17 Nov 2022 09:09:31 +0000 Received: from mahout.postgresql.org ([2001:4800:3e1:1::227]) by makus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ovatl-0004ZT-6l for pgsql-committers@lists.postgresql.org; Thu, 17 Nov 2022 09:09:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=postgresql.org; s=20171124; h=Date:Message-Id:Subject:To:From:MIME-Version: Content-Type:Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID: Content-Description:In-Reply-To:References; bh=WGmBGA10bXL6CnQIcFoJ84NeKGKSLHrTCRat2dumoFA=; b=RzOkTJS5Mg/lhF0l6c0yLRk0IF OctQgQB7YHXLupEWgc3XQTmGqtyV/4gKjHDW6sYf0/uHY0VDcwQ2RigA7y5d+uDUijEEo6PJVQz98 w5J3eE4FnbVl5DQ9Sem0KbNbjRxUWsfe+g8c5CbBCdyynVIAm5fFsZ4SVVeefogEG313Ak7eTvKdU PEEI3Ae7x2AxDXtzpUa+fVsG/VgjTvHDo28E11/qvAsWKkzH5nbgHRG8Jwdv1sMyuFUVl2pBgEI5I KF4ibfWa5OyX+lcREIcjOHQZRoa0r28hzQpFDHPeYB4o1dGUpRvhW04obKxk9YZXWqe3YayE6vy0k MYcJO/bg==; Received: from gemulon.postgresql.org ([2001:4800:3e1:1::198]) by mahout.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ovatk-0002R2-Rt for pgsql-committers@lists.postgresql.org; Thu, 17 Nov 2022 09:09:28 +0000 Received: from localhost ([127.0.0.1] helo=gemulon.postgresql.org) by gemulon.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1ovatj-000ZsY-KP for pgsql-committers@lists.postgresql.org; Thu, 17 Nov 2022 09:09:28 +0000 Content-Type: multipart/mixed; boundary="===============3393488161727903386==" MIME-Version: 1.0 From: Daniel Gustafsson To: pgsql-committers@lists.postgresql.org Subject: pgsql: doc: Fix wording of MERGE actions in README X-Auto-Response-Suppress: All Auto-Submitted: auto-generated Message-Id: Date: Thu, 17 Nov 2022 09:09:28 +0000 List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --===============3393488161727903386== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 ZG9jOiBGaXggd29yZGluZyBvZiBNRVJHRSBhY3Rpb25zIGluIFJFQURNRQoKVVBEQVRFIHdhcyBs aXN0ZWQgdHdpY2UgYW5kIERFTEVURSB3YXMgb21pdHRlZCwgcmVwbGFjZSBvbmUgVVBEQVRFCndp dGggREVMRVRFIGluc3RlYWQuCgpCYWNrcGF0Y2ggdGhyb3VnaCB2MTUgd2hlcmUgTUVSR0Ugd2Fz IGFkZGVkLgoKQXV0aG9yOiBNeW8gV2FpIFRoYW50IDxteW8ud2FpdGhhbnRAZnVqaXRzdS5jb20+ ClJldmlld2VkLWJ5OiBSaWNoYXJkIEd1byA8Z3VvZmVuZ2xpbnV4QGdtYWlsLmNvbT4KRGlzY3Vz c2lvbjogaHR0cHM6Ly9wb3N0Z3IuZXMvbS9PU0FQUjAxTUI0MzI0N0U0NjkzMUU5RTlDRkM0QUEw RjI5QTA3OUBPU0FQUjAxTUI0MzI0LmpwbnByZDAxLnByb2Qub3V0bG9vay5jb20KQmFja3BhdGNo LXRocm91Z2g6IDE1CgpCcmFuY2gKLS0tLS0tClJFTF8xNV9TVEFCTEUKCkRldGFpbHMKLS0tLS0t LQpodHRwczovL2dpdC5wb3N0Z3Jlc3FsLm9yZy9wZy9jb21taXRkaWZmLzFlYWE0OGU5OThlMjA3 NjZkNzBlZDgwY2Y1MzhmMzg3MWQxYzU2MmMKCk1vZGlmaWVkIEZpbGVzCi0tLS0tLS0tLS0tLS0t CnNyYy9iYWNrZW5kL2V4ZWN1dG9yL1JFQURNRSB8IDIgKy0KMSBmaWxlIGNoYW5nZWQsIDEgaW5z ZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0pCgo= --===============3393488161727903386==--