From: Arun <engineerarun@gmail.com>
Date: Mon, 30 May 2022 00:52:23 +0000 (+0530)
Subject: Merge pull request #1375 from luukvbaal/master
X-Git-Tag: v4.6~63
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=f8b8e77be9f11b90e3f129aa5a920e75cecdab05;p=nnn.git

Merge pull request #1375 from luukvbaal/master

Add patch conflict workflow
---

f8b8e77be9f11b90e3f129aa5a920e75cecdab05