nbelakov...@gmail.com writes:

> diff --git a/color.h b/color.h
> index 98894d6a17..857653df73 100644
> --- a/color.h
> +++ b/color.h
> @@ -42,6 +42,24 @@ struct strbuf;
>  #define GIT_COLOR_FAINT_BLUE "\033[2;34m"
>  #define GIT_COLOR_FAINT_MAGENTA      "\033[2;35m"
>  #define GIT_COLOR_FAINT_CYAN "\033[2;36m"
> +#define GIT_COLOR_LIGHT_RED  "\033[91m"
> +#define GIT_COLOR_LIGHT_GREEN        "\033[92m"
> +#define GIT_COLOR_LIGHT_YELLOW       "\033[93m"
> +#define GIT_COLOR_LIGHT_BLUE "\033[94m"
> +#define GIT_COLOR_LIGHT_MAGENTA      "\033[95m"
> +#define GIT_COLOR_LIGHT_CYAN "\033[96m"
> +#define GIT_COLOR_BOLD_LIGHT_RED     "\033[1;91m"
> +#define GIT_COLOR_BOLD_LIGHT_GREEN   "\033[1;92m"
> +#define GIT_COLOR_BOLD_LIGHT_YELLOW  "\033[1;93m"
> +#define GIT_COLOR_BOLD_LIGHT_BLUE    "\033[1;94m"
> +#define GIT_COLOR_BOLD_LIGHT_MAGENTA "\033[1;95m"
> +#define GIT_COLOR_BOLD_LIGHT_CYAN    "\033[1;96m"
> +#define GIT_COLOR_FAINT_LIGHT_RED    "\033[2;91m"
> +#define GIT_COLOR_FAINT_LIGHT_GREEN  "\033[2;92m"
> +#define GIT_COLOR_FAINT_LIGHT_YELLOW "\033[2;93m"
> +#define GIT_COLOR_FAINT_LIGHT_BLUE   "\033[2;94m"
> +#define GIT_COLOR_FAINT_LIGHT_MAGENTA        "\033[2;95m"
> +#define GIT_COLOR_FAINT_LIGHT_CYAN   "\033[2;96m"

Hopefully you made sure that there is no other topic in-flight that
touch this area before doing this change?  Otherwise you'd be
creating pointless merge conflict by futzing with spaces.

Ditto for an earlier hunk of this patch.

Thanks.

Reply via email to