nnn

commit a0fcd78df25969014a96410d12eeae6643bb410c
parent 53fbab1f44fcb42f52d6470689f3574799401462
Author: Luuk van Baal <luukvbaal@gmail.com>
Date:   Thu, 21 Oct 2021 13:39:09 +0200

Resolve gitstatus patch conflict

Diffstat:
M
patches/gitstatus/mainline.diff
 | 
4
++--
M
patches/gitstatus/namefirst.diff
 | 
4
++--

2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/patches/gitstatus/mainline.diff b/patches/gitstatus/mainline.diff
@@ -189,8 +189,8 @@ index 897c32f1..00b57c2e 100644
 
  	while ((opt = (env_opts_id > 0
  		       ? env_opts[--env_opts_id]
--		       : getopt(argc, argv, "aAb:cCdDeEfF:gHJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
-+		       : getopt(argc, argv, "aAb:cCdDeEfF:gGHJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
+-		       : getopt(argc, argv, "aAb:cCdDeEfF:gHiJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
++		       : getopt(argc, argv, "aAb:cCdDeEfF:gGHiJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
  		switch (opt) {
  #ifndef NOFIFO
  		case 'a':
diff --git a/patches/gitstatus/namefirst.diff b/patches/gitstatus/namefirst.diff
@@ -193,8 +193,8 @@ index 5801e28e..8a88d5e7 100644
 
  	while ((opt = (env_opts_id > 0
  		       ? env_opts[--env_opts_id]
--		       : getopt(argc, argv, "aAb:cCdDeEfF:gHJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
-+		       : getopt(argc, argv, "aAb:cCdDeEfF:gGHJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
+-		       : getopt(argc, argv, "aAb:cCdDeEfF:gHiJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
++		       : getopt(argc, argv, "aAb:cCdDeEfF:gGHiJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
  		switch (opt) {
  #ifndef NOFIFO
  		case 'a':