From: Arun <engineerarun@gmail.com>
Date: Tue, 31 May 2022 11:06:23 +0000 (+0530)
Subject: Merge pull request #1380 from luukvbaal/master
X-Git-Tag: v4.6~56
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=01ab453cffd10a8ed3a25f7dbea1f4b042d88a8f;p=nnn.git

Merge pull request #1380 from luukvbaal/master

Update patch conflict instructions/workflow
---

01ab453cffd10a8ed3a25f7dbea1f4b042d88a8f