Merge branch 'tr/word-diff'
commit1bdd46cd3a2fe1e0aeb965fb0edb493064e24495
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 May 2010 11:02:17 +0000 (21 04:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 May 2010 11:02:17 +0000 (21 04:02 -0700)
tree9fa257f211ffb509cb07dac585f5a80b433d795c
parente22d62d9151e0e51c3dc4f951fb5d88dc30482c6
parent882749a04f828fccd795deec4d0bf10ba09ae549
Merge branch 'tr/word-diff'

* tr/word-diff:
  diff: add --word-diff option that generalizes --color-words

Conflicts:
diff.c
Documentation/diff-options.txt
Documentation/gitattributes.txt
diff.c