Merge branch 'js/diff-color-words'
commit9847a524321afbfa6dbb08bfd9b6a0746f965578
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 Jan 2009 01:13:29 +0000 (25 17:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Jan 2009 01:13:29 +0000 (25 17:13 -0800)
tree4bceeb48691dab9f86b63b02c7001eb5119716d5
parentd64d4835b83669d5c9c8ce1989859efa803874db
parentae3b970ac3e21324a95fea75213c2569180d74c6
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
Documentation/config.txt
Documentation/diff-options.txt
color.c
color.h
diff.c