Resolve gitstatus patch conflict

diff --git a/patches/gitstatus/mainline.diff b/patches/gitstatus/mainline.diff
index c6ce46609387de0abbd37a983fffabe7923a7638..c747c5e6fd8e5541ca8c44dea3b7e60f2a0e1dd2 100644 (file)
--- 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
index 2d43e4f11ae82b46e2ce5c0f7108d93e4898a145..a4d0c527343481f5ba41a80ea6b99306e7fa7e24 100644 (file)
--- 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':