From: Terminator X <engineerarun@gmail.com>
Date: Sat, 9 Oct 2021 13:41:03 +0000 (+0530)
Subject: Merge pull request #1191 from luukvbaal/patches
X-Git-Tag: v4.4~56
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=98585153cc09fa31cd1b6fa5af8a2b4651effcf8;p=nnn.git

Merge pull request #1191 from luukvbaal/patches

Fix gitstatus regression and restorepreview conflict
---

98585153cc09fa31cd1b6fa5af8a2b4651effcf8