From: Arun <engineerarun@gmail.com>
Date: Mon, 30 May 2022 16:42:30 +0000 (+0530)
Subject: Merge pull request #1377 from luukvbaal/patches
X-Git-Tag: v4.6~61
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=d859e814440af557be4ca8d106e9776113e87842;p=nnn.git

Merge pull request #1377 from luukvbaal/patches

Add patch conflict instructions
---

d859e814440af557be4ca8d106e9776113e87842