Merge branch 'js/diff-color-words'

* js/diff-color-words:
  Change the spelling of "wordregex".
  color-words: Support diff.wordregex config option
  color-words: make regex configurable via attributes
  color-words: expand docs with precise semantics
  color-words: enable REG_NEWLINE to help user
  color-words: take an optional regular expression describing words
  color-words: change algorithm to allow for 0-character word boundaries
  color-words: refactor word splitting and use ALLOC_GROW()
  Add color_fwrite_lines(), a function coloring each line individually

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/diff-options.txt
Simple merge

diff --cc color.c
Simple merge

diff --cc color.h
index 70660999df4b937b542fff6163b798bf16841b7f,cd5c985eb7ee51c332020722fdf6282637822f37..5019df82f79f1888b3aa57b9752a6a55b13f475a
--- 1/color.h
--- 2/color.h
+++ b/color.h
@@@ -16,9 -16,9 +16,10 @@@ extern int git_use_color_default
  int git_color_default_config(const char *var, const char *value, void *cb);
  
  int git_config_colorbool(const char *var, const char *value, int stdout_is_tty);
 -void color_parse(const char *var, const char *value, char *dst);
 +void color_parse(const char *value, const char *var, char *dst);
 +void color_parse_mem(const char *value, int len, const char *var, char *dst);
  int color_fprintf(FILE *fp, const char *color, const char *fmt, ...);
  int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...);
+ int color_fwrite_lines(FILE *fp, const char *color, size_t count, const char *buf);
  
  #endif /* COLOR_H */

diff --cc diff.c
Simple merge