Merge branch 'jk/parse-options-concat' into maint

diff --git a/color.h b/color.h
index e155d13f784362a5fdd993e1e383e660fa324c30..b9ead166b94e6bbf3bfcd25ff334caed9120927c 100644 (file)
--- a/color.h
+++ b/color.h
@@ -18,11 +18,6 @@ struct strbuf;
  */
 #define COLOR_MAXLEN 70
 
-/*
- * IMPORTANT: Due to the way these color codes are emulated on Windows,
- * write them only using printf(), fprintf(), and fputs(). In particular,
- * do not use puts() or write().
- */
 #define GIT_COLOR_NORMAL       ""
 #define GIT_COLOR_RESET                "\033[m"
 #define GIT_COLOR_BOLD         "\033[1m"