From: Terminator X <engineerarun@gmail.com>
Date: Thu, 21 Oct 2021 11:41:14 +0000 (+0530)
Subject: Merge pull request #1203 from luukvbaal/patches
X-Git-Tag: v4.4~41
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=f3e027c2838cd56c68e116c75aaff64ea4891e86;p=nnn.git

Merge pull request #1203 from luukvbaal/patches

Resolve gitstatus patch conflict
---

f3e027c2838cd56c68e116c75aaff64ea4891e86