From: Scott Worley <scottworley@scottworley.com>
Date: Tue, 16 Feb 2021 19:29:44 +0000 (-0800)
Subject: polite-merge: 2.1 -> 2.3, required for git 2.28 -> 2.29
X-Git-Url: http://git.scottworley.com/auto-upgrade-with-pinch/commitdiff_plain/2e5763d635cc9c77947acd613f5d2246bd88f4db?hp=2e5763d635cc9c77947acd613f5d2246bd88f4db

polite-merge: 2.1 -> 2.3, required for git 2.28 -> 2.29
---