resolving merge conflict from another local branch

src/Win32_Interop/Win32_ANSI.c

@@ -20,7 +20,7 @@
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-/* Derived from ANSI.c by Jason Hood, from his ansicon project: https://github.com/adoxa/ansicon. */
+/* Derived from ANSI.c by Jason Hood, from his ansicon project (https://github.com/adoxa/ansicon), with modifications. */
 
 #include <windows.h>
 #include <stdio.h>

src/redis-cli.c

@@ -236,21 +236,6 @@ static void cliOutputCommandHelp(struct commandHelp *help, int group) {
 /* Print generic help. */
 static void cliOutputGenericHelp() {
     sds version = cliVersion();
-#ifdef _WIN32
-    int i = 0;
-    int groupslen = sizeof(commandGroups) / sizeof(char*);
-    printf(
-        "\x1b[0mredis-cli %s\r\n"
-        "Type: \"help @<group>\" to get a list of commands in <group>\r\n",
-        version );
-    printf("         Where <group> is one of:\n");
-    for (i = 0; i < groupslen; i++) {
-        printf("            \x1b[1m%s\x1b[0m\n", commandGroups[i]);
-    }
-    printf(
-        "      \"help <command>\" for help on <command>\r\n"
-        "      \"quit\" to exit\r\n" );
-#else
     printf(
         "redis-cli %s\r\n"
         "Type: \"help @<group>\" to get a list of commands in <group>\r\n"
@@ -259,7 +244,6 @@ static void cliOutputGenericHelp() {
         "      \"quit\" to exit\r\n",
         version
     );
-#endif
     sdsfree(version);
 }