From: Scott Worley <scottworley@scottworley.com>
Date: Fri, 29 May 2020 21:56:10 +0000 (-0700)
Subject: Use polite-merge for merging
X-Git-Url: http://git.scottworley.com/auto-upgrade-with-pinch/commitdiff_plain/5048e8ce3c5c7a54684ca806ea027dc552fea1eb?hp=5048e8ce3c5c7a54684ca806ea027dc552fea1eb

Use polite-merge for merging
---